diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-07 19:53:03 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-07 19:53:03 +0100 |
| commit | 214fa81ec62eeb8a735d2196373c37e89d02666a (patch) | |
| tree | b0dfd9d52d6824210b543ba871933f817504cb22 /include/items.php | |
| parent | 98fd3118911313c3f365cc535e9357cd92268534 (diff) | |
| parent | 0d415fb3c9db41ee97b7ce933ebc84eab38a1fa4 (diff) | |
| download | volse-hubzilla-214fa81ec62eeb8a735d2196373c37e89d02666a.tar.gz volse-hubzilla-214fa81ec62eeb8a735d2196373c37e89d02666a.tar.bz2 volse-hubzilla-214fa81ec62eeb8a735d2196373c37e89d02666a.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/items.php b/include/items.php index 722757f87..d0b9cffc9 100755 --- a/include/items.php +++ b/include/items.php @@ -4063,8 +4063,9 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $item_uids = ' true '; $item_normal = item_normal(); - - if ($arr['uid']) $uid= $arr['uid']; + if($arr['uid']) { + $uid = $arr['uid']; + } if($channel) { $uid = $channel['channel_id']; @@ -4226,7 +4227,7 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $items = q("SELECT item.*, item.id AS item_id FROM item WHERE $item_uids $item_restrict $simple_update - $sql_extra $sql_nets + $sql_extra $sql_nets $sql_extra3 ORDER BY item.received DESC $pager_sql" ); |