clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplifying the code

This commit is contained in:
Michael 2020-08-15 11:47:11 +00:00
parent 24b5396b1d
commit 17bc81d36e
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mod/network.php
View File

@ -609,14 +609,11 @@ function networkThreadedView(App $a, $update, $parent)
$condition1['unseen'] = true; $condition1['unseen'] = true;
} }
$condition = DBA::mergeConditions($condition1, $condition2);
$params = ['order' => [$order_mode => true], 'limit' => 100]; $params = ['order' => [$order_mode => true], 'limit' => 100];
$r = DBA::selectToArray('network-item-view', [], $condition, $params);
} else { } else {
$condition = DBA::mergeConditions($condition1, $condition2);
$params = ['order' => [$order_mode => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]]; $params = ['order' => [$order_mode => true], 'limit' => [$pager->getStart(), $pager->getItemsPerPage()]];
$r = DBA::selectToArray('network-thread-view', [], $condition, $params);
} }
$r = DBA::selectToArray('network-item-view', [], DBA::mergeConditions($condition1, $condition2), $params);
return $o . network_display_post($a, $pager, (!$gid && !$cid && !$star), $update, $ordering, $r); return $o . network_display_post($a, $pager, (!$gid && !$cid && !$star), $update, $ordering, $r);
} }