aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-28 18:47:28 -0700
committerfriendica <info@friendica.com>2015-03-28 18:47:28 -0700
commit76a6739b93c1c8f08dd95a45235dd89fb4c507af (patch)
tree018ade0ae2e25cdd6acd36f3147ff2d4faac0b2f
parentdcac6a54c5332d1e991e36283d32ff36fa3ccef6 (diff)
downloadvolse-hubzilla-76a6739b93c1c8f08dd95a45235dd89fb4c507af.tar.gz
volse-hubzilla-76a6739b93c1c8f08dd95a45235dd89fb4c507af.tar.bz2
volse-hubzilla-76a6739b93c1c8f08dd95a45235dd89fb4c507af.zip
remove bogus grouping from fix for #938
-rwxr-xr-xinclude/items.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index 4246dd41f..ef269b9c4 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4395,7 +4395,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
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
- $sql_extra GROUP BY parent, created ORDER BY created ASC $limit",
+ $sql_extra GROUP BY parent ORDER BY created ASC $limit",
intval($uid),
intval(ITEM_WALL)
);
@@ -4404,7 +4404,7 @@ function zot_feed($uid,$observer_xchan,$arr) {
$r = q("SELECT parent, created from item
WHERE uid = %d AND item_restrict = 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(ITEM_WALL)
);