Merge pull request #4506 from annando/fix-update

Fix for network update (number of maximum comments set to 0)

diff --git a/include/conversation.php b/include/conversation.php
index b262ee4c828b498734a7e9b7e2e96c903674318b..6696af0fdc8a4e7b3d93b83dfffdabdee82f2907 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -901,7 +901,13 @@ function conversation(App $a, $items, $mode, $update, $preview = false, $order =
  * @return array items with parents and comments
  */
 function conversation_add_children($parents, $block_authors, $order) {
-       $max_comments = Config::get("system", "max_comments", 100);
+       $max_comments = Config::get('system', 'max_comments', 100);
+
+       if ($max_comments > 0) {
+               $limit = ' LIMIT '.intval($max_comments + 1);
+       } else {
+               $limit = '';
+       }
 
        $items = [];
 
@@ -910,7 +916,7 @@ function conversation_add_children($parents, $block_authors, $order) {
        foreach ($parents AS $parent) {
                $thread_items = dba::p(item_query()." AND `item`.`uid` = ?
                        AND `item`.`parent-uri` = ? $block_sql
-                       ORDER BY `item`.`commented` DESC LIMIT ".intval($max_comments + 1),
+                       ORDER BY `item`.`commented` DESC" . $limit,
                        local_user(),
                        $parent['uri']
                );

diff --git a/mod/network.php b/mod/network.php
index 9aa1c6e9e4a87b8e4f9376b4828e2bf9405fe407..6373af8022c4d724031f0df6c81c29c259404317 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -857,20 +857,18 @@ function networkThreadedView(App $a, $update = 0)
                $parents_arr = [];
 
                foreach ($items as $item) {
+                       if ($date_offset < $item['order_date']) {
+                               $date_offset = $item['order_date'];
+                       }
                        if (!in_array($item['item_id'], $parents_arr)) {
                                $parents_arr[] = $item['item_id'];
                        }
                }
-
                $parents_str = implode(', ', $parents_arr);
        }
 
        if (x($_GET, 'offset')) {
                $date_offset = $_GET['offset'];
-       } elseif (count($items)) {
-               $date_offset = $items[0][$order_mode];
-       } else {
-               $date_offset = '';
        }
 
        $a->page_offset = $date_offset;