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

issue #571 - use feed/nickname?top=1

Browse Source
This commit is contained in:
friendica 2014-08-22 15:51:48 -07:00
parent 9dbfed64be
commit 2dc705d9a0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/items.php
View File

@ -400,6 +400,7 @@ function get_public_feed($channel,$params) {
$params['records'] = ((x($params,'records')) ? $params['records'] : 40); $params['records'] = ((x($params,'records')) ? $params['records'] : 40);
$params['direction'] = ((x($params,'direction')) ? $params['direction'] : 'desc'); $params['direction'] = ((x($params,'direction')) ? $params['direction'] : 'desc');
$params['pages'] = ((x($params,'pages')) ? intval($params['pages']) : 0); $params['pages'] = ((x($params,'pages')) ? intval($params['pages']) : 0);
$params['top'] = ((x($params,'top')) ? intval($params['top']) : 0);
switch($params['type']) { switch($params['type']) {
case 'json': case 'json':
@ -440,7 +441,8 @@ function get_feed_for($channel, $observer_hash, $params) {
'records' => $params['records'], // FIXME 'records' => $params['records'], // FIXME
'direction' => $params['direction'], // FIXME 'direction' => $params['direction'], // FIXME
'pages' => $params['pages'], 'pages' => $params['pages'],
'order' => 'post' 'order' => 'post',
'top' => $params['top']
), $channel, $observer_hash, CLIENT_MODE_NORMAL, get_app()->module); ), $channel, $observer_hash, CLIENT_MODE_NORMAL, get_app()->module);
@ -4186,6 +4188,9 @@ function items_fetch($arr,$channel = null,$observer_hash = null,$client_mode = C
$parents_str = ids_to_querystr($r,'item_id'); $parents_str = ids_to_querystr($r,'item_id');
if($arr['top'])
$sql_extra = ' and id = parent ' . $sql_extra;
$items = q("SELECT item.*, item.id AS item_id FROM item $items = q("SELECT item.*, item.id AS item_id FROM item
WHERE $item_uids $item_restrict WHERE $item_uids $item_restrict
AND item.parent IN ( %s ) AND item.parent IN ( %s )

1
mod/feed.php
View File

@ -11,6 +11,7 @@ function feed_init(&$a) {
$params['end'] = ((x($_REQUEST,'date_end')) ? $_REQUEST['date_end'] : ''); $params['end'] = ((x($_REQUEST,'date_end')) ? $_REQUEST['date_end'] : '');
$params['type'] = ((stristr(argv(0),'json')) ? 'json' : 'xml'); $params['type'] = ((stristr(argv(0),'json')) ? 'json' : 'xml');
$params['pages'] = ((x($_REQUEST,'pages')) ? intval($_REQUEST['pages']) : 0); $params['pages'] = ((x($_REQUEST,'pages')) ? intval($_REQUEST['pages']) : 0);
$params['top'] = ((x($_REQUEST,'top')) ? intval($_REQUEST['top']) : 0);
$channel = ''; $channel = '';
if(argc() > 1) { if(argc() > 1) {