X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fnetwork.php;h=0ec975ed42f46ef371c6bdaa6a3ac3ea8e1d2895;hb=17bc81d36edc6fe735b68802c8e76d18bcf6c30b;hp=0002743ab0dff1d8714dba5cee9e919d29a187d3;hpb=24b5396b1d1e0c63b6dcc4d6d0ab7b73fb9d4cd8;p=friendica.git diff --git a/mod/network.php b/mod/network.php index 0002743ab0..0ec975ed42 100644 --- a/mod/network.php +++ b/mod/network.php @@ -609,14 +609,11 @@ function networkThreadedView(App $a, $update, $parent) $condition1['unseen'] = true; } - $condition = DBA::mergeConditions($condition1, $condition2); $params = ['order' => [$order_mode => true], 'limit' => 100]; - $r = DBA::selectToArray('network-item-view', [], $condition, $params); } else { - $condition = DBA::mergeConditions($condition1, $condition2); $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); }