diff options
| author | zotlabs <mike@macgirvin.com> | 2017-08-06 19:33:51 -0700 |
|---|---|---|
| committer | git-marijus <mario@mariovavti.com> | 2017-08-07 13:32:04 +0200 |
| commit | 037e1edb1fd2e56f776d0f86f0023141949154cf (patch) | |
| tree | 3041ce30e09e7e4b08851daed90865bca18e3385 | |
| parent | 23f9f8bc3bc24a30eb954f73e7e4846ae4fcbb69 (diff) | |
| download | volse-hubzilla-037e1edb1fd2e56f776d0f86f0023141949154cf.tar.gz volse-hubzilla-037e1edb1fd2e56f776d0f86f0023141949154cf.tar.bz2 volse-hubzilla-037e1edb1fd2e56f776d0f86f0023141949154cf.zip | |
ostatus feed was missing comments
| -rw-r--r-- | include/feedutils.php | 2 | ||||
| -rwxr-xr-x | include/items.php | 12 |
2 files changed, 5 insertions, 9 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index e3f899a1e..07cb79340 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -115,7 +115,7 @@ function get_feed_for($channel, $observer_hash, $params) { $items = items_fetch( [ - 'wall' => '1', + 'wall' => '1', 'datequery' => $params['end'], 'datequery2' => $params['begin'], 'start' => intval($params['start']), diff --git a/include/items.php b/include/items.php index 386c25922..5a0ca01c6 100755 --- a/include/items.php +++ b/include/items.php @@ -3929,8 +3929,8 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C } } - if(intval($arr['compat']) === 1) { - $sql_extra = " AND author_xchan = owner_xchan and item_wall = 1 and item_private = 0 "; + if($channel && intval($arr['compat']) === 1) { + $sql_extra = " AND author_xchan = '" . $channel['channel_hash'] . "' and item_private = 0 "; } if ($arr['datequery']) { @@ -3940,11 +3940,6 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C $sql_extra3 .= protect_sprintf(sprintf(" AND item.created >= '%s' ", dbesc(datetime_convert('UTC','UTC',$arr['datequery2'])))); } - if(! array_key_exists('nouveau',$arr)) { - $sql_extra2 = " AND item.parent = item.id "; -// $sql_extra3 = ''; - } - if($arr['search']) { if(strpos($arr['search'],'#') === 0) @@ -4016,7 +4011,8 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C if($arr['item_type'] === '*') $item_restrict = ''; - if ($arr['nouveau'] && ($client_mode & CLIENT_MODE_LOAD) && $channel) { + if ((($arr['compat']) || ($arr['nouveau'] && ($client_mode & CLIENT_MODE_LOAD))) && $channel) { + // "New Item View" - show all items unthreaded in reverse created date order $items = q("SELECT item.*, item.id AS item_id FROM item |