aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-05-09 11:58:10 +0200
committerMario Vavti <mario@mariovavti.com>2016-05-09 11:58:10 +0200
commita3e94591bcf778d9b9ed2f49c497f5c5e66af422 (patch)
treeae19662469e64d6cc94c3107a050f761f12853ea /Zotlabs
parent24c1dc528dd981fc73baab8dc47840439e81f3b7 (diff)
parent6f486a3393fe33db70ef2f1684dd3b79768d1137 (diff)
downloadvolse-hubzilla-a3e94591bcf778d9b9ed2f49c497f5c5e66af422.tar.gz
volse-hubzilla-a3e94591bcf778d9b9ed2f49c497f5c5e66af422.tar.bz2
volse-hubzilla-a3e94591bcf778d9b9ed2f49c497f5c5e66af422.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Network.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index fdfa99c12..c88258a78 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -446,7 +446,7 @@ class Network extends \Zotlabs\Web\Controller {
$ordering = "commented";
if($load) {
-
+
// Fetch a page full of parent items for this page
$r = q("SELECT distinct item.id AS item_id, $ordering FROM item
@@ -469,7 +469,7 @@ class Network extends \Zotlabs\Web\Controller {
);
$_SESSION['loadtime'] = datetime_convert();
}
-
+
// Then fetch all the children of the parents that are on this page
$parents_str = '';
$update_unseen = '';