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

issue #938

Browse Source
This commit is contained in:
friendica 2015-03-28 18:45:58 -07:00
parent f35679dd6d
commit 1e4490079b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/items.php
View File

@ -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)
);