harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sql errors on postgres with yestderday's optimisation

Browse Source
This commit is contained in:
friendica 2015-03-24 12:40:55 -07:00
parent c024668cf2
commit 00b3c4c881
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/items.php
View File

@ -4381,7 +4381,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
if(is_sys_channel($uid)) { if(is_sys_channel($uid)) {
require_once('include/security.php'); require_once('include/security.php');
$r = q("SELECT parent from item $r = q("SELECT parent, created from item
WHERE uid != %d WHERE uid != %d
AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ") AND item_private = 0 AND item_restrict = 0 AND uid in (" . stream_perms_api_uids(PERMS_PUBLIC,10,1) . ")
AND (item_flags & %d) > 0 AND (item_flags & %d) > 0
@ -4391,7 +4391,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
); );
} }
else { else {
$r = q("SELECT parent from item $r = q("SELECT parent, created from item
WHERE uid = %d AND item_restrict = 0 WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d) > 0 AND (item_flags & %d) > 0
$sql_extra GROUP BY parent ORDER BY created ASC $limit", $sql_extra GROUP BY parent ORDER BY created ASC $limit",