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

ostatus feed was missing comments

Browse Source
This commit is contained in:
zotlabs 2017-08-06 19:33:51 -07:00
parent 88a4889780
commit c00796d553
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/feedutils.php
View File

@ -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']),

12
include/items.php
View File

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