friendica
/
friendica
mirror of https://git.friendi.ca/friendica/friendica.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rearranged code

pull/3706/head
Michael 2017-09-13 09:20:08 +00:00
parent a5cf2c69c8
commit 92537d6926
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mod/network.php
View File

@ -290,7 +290,7 @@ function network_query_get_sel_group(App $a) {
return $group;
}
function networkSetPager($a, $update) {
function networkPager($a, $update) {
if ($update) {
// only setup pagination on initial page view
return ' LIMIT 100';
@ -442,7 +442,7 @@ function networkFlatView(App $a, $update = 0) {
$sql_post_table = " INNER JOIN `thread` ON `thread`.`iid` = `item`.`parent`";
}
$pager_sql = networkSetPager($a, $update);
$pager_sql = networkPager($a, $update);
// show all items unthreaded in reverse created date order
$items = q("SELECT %s FROM `item` $sql_post_table %s
@ -696,8 +696,6 @@ function networkThreadedView(App $a, $update = 0) {
$sql_extra3 .= " AND $sql_table.`mention`";
}
$pager_sql = networkSetPager($a, $update);
// Normal conversation view
if ($order === 'post') {
$ordering = "`created`";
@ -719,6 +717,8 @@ function networkThreadedView(App $a, $update = 0) {
$sql_extra3 .= sprintf(" AND $sql_order <= '%s'", dbesc($_GET["offset"]));
}
$pager_sql = networkPager($a, $update);
switch ($order_mode) {
case 'received':
if ($last_received != '') {