aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-24 12:40:55 -0700
committerfriendica <info@friendica.com>2015-03-24 12:40:55 -0700
commit00b3c4c881290427189185cdf4a247285aa79e5b (patch)
treebe533e81c47e154df8c28e3e2fa63b0080446602
parentc024668cf226da7211aaa8cdd04293cf00b8901c (diff)
downloadvolse-hubzilla-00b3c4c881290427189185cdf4a247285aa79e5b.tar.gz
volse-hubzilla-00b3c4c881290427189185cdf4a247285aa79e5b.tar.bz2
volse-hubzilla-00b3c4c881290427189185cdf4a247285aa79e5b.zip
sql errors on postgres with yestderday's optimisation
-rwxr-xr-xinclude/items.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index 32e5dcbe5..d1998bd0a 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4381,7 +4381,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
if(is_sys_channel($uid)) {
require_once('include/security.php');
- $r = q("SELECT parent from item
+ $r = q("SELECT parent, created from item
WHERE uid != %d
AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ")
AND (item_flags & %d) > 0
@@ -4391,7 +4391,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
);
}
else {
- $r = q("SELECT parent from item
+ $r = q("SELECT parent, created from item
WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d) > 0
$sql_extra GROUP BY parent ORDER BY created ASC $limit",