aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-09 01:12:24 -0700
committerredmatrix <git@macgirvin.com>2016-05-09 01:12:24 -0700
commit6f486a3393fe33db70ef2f1684dd3b79768d1137 (patch)
tree4d6967687dcc9b1c9bbbdb443b0038146c31335a /Zotlabs
parent94accd8a4c7500ee4f5c268fe7e84ad3ed9a6675 (diff)
downloadvolse-hubzilla-6f486a3393fe33db70ef2f1684dd3b79768d1137.tar.gz
volse-hubzilla-6f486a3393fe33db70ef2f1684dd3b79768d1137.tar.bz2
volse-hubzilla-6f486a3393fe33db70ef2f1684dd3b79768d1137.zip
prevent recursion in the database driver when debugging is enabled and the system config is not yet loaded - caused by calling get_config and making db calls within the logger function; which we then attempt to log...
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 = '';