aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-28 18:45:58 -0700
committerfriendica <info@friendica.com>2015-03-28 18:45:58 -0700
commit1e4490079b5257a8a90064eb986e16825391421d (patch)
treec8f55b593149e6e0bc3bf2fa601a5cf2aeb41570
parentf35679dd6d606d9c9a31e9e807bd2aed8ba89641 (diff)
downloadvolse-hubzilla-1e4490079b5257a8a90064eb986e16825391421d.tar.gz
volse-hubzilla-1e4490079b5257a8a90064eb986e16825391421d.tar.bz2
volse-hubzilla-1e4490079b5257a8a90064eb986e16825391421d.zip
issue #938
-rwxr-xr-xinclude/items.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index a8947202d..4246dd41f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -4383,13 +4383,19 @@ function zot_feed($uid,$observer_xchan,$arr) {
$items = array();
+ // FIXME
+
+ if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+ return array();
+ }
+
if(is_sys_channel($uid)) {
require_once('include/security.php');
$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
- $sql_extra GROUP BY parent ORDER BY created ASC $limit",
+ $sql_extra GROUP BY parent, created ORDER BY created ASC $limit",
intval($uid),
intval(ITEM_WALL)
);
@@ -4398,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 ORDER BY created ASC $limit",
+ $sql_extra GROUP BY parent, created ORDER BY created ASC $limit",
intval($uid),
intval(ITEM_WALL)
);