Merge branch 'rewrites/dbm_is_result' of github.com:Quix0r/friendica into rewrites...

[friendica.git] / mod / network.php

diff --git a/mod/network.php b/mod/network.php
index 601b7e7cb7874cea05e436926810a87134b5c33f..5281a2ede9aaf3ea9b7d9558fa2fd4721171e163 100644 (file)
--- a/mod/network.php
+++ b/mod/network.php
@@ -729,7 +729,9 @@ function network_content(&$a, $update = 0) {
                                        intval($parents),
                                        intval($max_comments + 1)
                                );
-                               $items = array_merge($items, $thread_items);
+       
+                               if (dbm::is_result($thread_items))
+                                       $items = array_merge($items, $thread_items);
                        }
                        $items = conv_sort($items,$ordering);
                } else {