diff options
| author | friendica <info@friendica.com> | 2014-01-25 15:03:23 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-25 15:03:23 -0800 |
| commit | 6911439f0e5bce19cdefb722378d695f5f7db65e (patch) | |
| tree | 55b9bd893b214378fb721bb94b28698b4b840db8 /include/items.php | |
| parent | e68c01cc483eee6b9b04e208f75868f1fef91633 (diff) | |
| parent | a25b8c951ba7c1f2f43c56b136bcea9731c6ab32 (diff) | |
| download | volse-hubzilla-6911439f0e5bce19cdefb722378d695f5f7db65e.tar.gz volse-hubzilla-6911439f0e5bce19cdefb722378d695f5f7db65e.tar.bz2 volse-hubzilla-6911439f0e5bce19cdefb722378d695f5f7db65e.zip | |
Merge pull request #284 from cvogeley/master
API changes
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index 12823c6f9..364ff9f3f 100755 --- a/include/items.php +++ b/include/items.php @@ -3719,21 +3719,26 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $def_acl = ''; $item_uids = ' true '; - + + if ($arr['uid']) $uid= $arr['uid']; + if($channel) { $uid = $channel['channel_id']; $uidhash = $channel['channel_hash']; $item_uids = " item.uid = " . intval($uid) . " "; } - + if($arr['star']) $sql_options .= " and (item_flags & " . intval(ITEM_STARRED) . ") "; if($arr['wall']) $sql_options .= " and (item_flags & " . intval(ITEM_WALL) . ") "; - + $sql_extra = " AND item.parent IN ( SELECT parent FROM item WHERE (item_flags & " . intval(ITEM_THREAD_TOP) . ") $sql_options ) "; - + + if($arr['since_id']) + $sql_extra .= " and item.id > " . $since_id . " "; + if($arr['gid'] && $uid) { $r = q("SELECT * FROM `groups` WHERE id = %d AND uid = %d LIMIT 1", intval($arr['group']), @@ -3897,7 +3902,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C ORDER BY item.$ordering DESC $pager_sql ", intval(ABOOK_FLAG_BLOCKED) ); - + } else { // update |