From ccfaf6eef3d37a957e2ac2457615bc8f288c965c Mon Sep 17 00:00:00 2001 From: Michael Date: Wed, 28 Feb 2018 20:21:31 +0000 Subject: [PATCH] Items on the network page should now be ordered always like expected --- mod/network.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/mod/network.php b/mod/network.php index 5ec97dbe99..c2cb8e03fc 100644 --- a/mod/network.php +++ b/mod/network.php @@ -345,7 +345,7 @@ function networkConversation($a, $items, $mode, $update, $ordering = '') // Set this so that the conversation function can find out contact info for our wall-wall items $a->page_contact = $a->contact; - $o = conversation($a, $items, $mode, $update, $ordering); + $o = conversation($a, $items, $mode, $update, false, $ordering); if (!$update) { if (PConfig::get(local_user(), 'system', 'infinite_scroll')) { @@ -689,9 +689,6 @@ function networkThreadedView(App $a, $update, $parent) dbesc(DateTimeFormat::convert($datequery2, 'UTC', date_default_timezone_get())))); } - $sql_order = ''; - $order_mode = 'received'; - if ($conv) { $sql_extra3 .= " AND $sql_table.`mention`"; } @@ -699,14 +696,10 @@ function networkThreadedView(App $a, $update, $parent) // Normal conversation view if ($order === 'post') { $ordering = '`created`'; - if ($sql_order == '') { - $order_mode = 'created'; - } + $order_mode = 'created'; } else { $ordering = '`commented`'; - if ($sql_order == '') { - $order_mode = 'commented'; - } + $order_mode = 'commented'; } if ($sql_order == '') {