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

remove bogus grouping from fix for #938

Browse Source
This commit is contained in:
friendica 2015-03-28 18:47:28 -07:00
parent dcac6a54c5
commit 76a6739b93
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

@ -4395,7 +4395,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
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
$sql_extra GROUP BY parent, created ORDER BY created ASC $limit", $sql_extra GROUP BY parent ORDER BY created ASC $limit",
intval($uid), intval($uid),
intval(ITEM_WALL) intval(ITEM_WALL)
); );
@ -4404,7 +4404,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
$r = q("SELECT parent, created 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, created ORDER BY created ASC $limit", $sql_extra GROUP BY parent ORDER BY created ASC $limit",
intval($uid), intval($uid),
intval(ITEM_WALL) intval(ITEM_WALL)
); );