diff options
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/include/items.php b/include/items.php index 1514ca7b6..38ee5df58 100755 --- a/include/items.php +++ b/include/items.php @@ -4732,24 +4732,27 @@ function zot_feed($uid,$observer_xchan,$mindate) { if(! $mindate) $mindate = '0000-00-00 00:00:00'; + $mindate = dbesc($mindate); + if(! perm_is_allowed($uid,$observer_xchan,'view_stream')) { return $result; } -// FIXME - $sql_extra = item_permissions_sql($uid,$remote_contact,$groups); + $sql_extra = item_permissions_sql($uid); - if($mindate != '0000-00-00 00:00:00') + if($mindate != '0000-00-00 00:00:00') { $sql_extra .= " and created > '$mindate' "; + $limit = ""; + } + else + $limit = " limit 0, 50 "; - - $limit = 50; $items = array(); $r = q("SELECT item.*, item.id as item_id from item WHERE uid = %d AND item_restrict = 0 and id = parent AND (item_flags & %d) - $sql_extra ORDER BY created ASC limit 0, $limit", + $sql_extra ORDER BY created ASC $limit", intval($uid), intval(ITEM_WALL) ); |