diff options
| author | friendica <info@friendica.com> | 2012-06-20 05:06:20 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-20 05:06:20 -0700 |
| commit | 0d0f129d045e7a25d750c9eb2995d488678986e5 (patch) | |
| tree | ebd15ffd9e95a9ed3a0b805f46e5711e9d8083b9 /include | |
| parent | f0db196288e60c0165810edea009711dcbbdb218 (diff) | |
| parent | 3a8c1a43715f713998451ad6056b44fc8602018c (diff) | |
| download | volse-hubzilla-0d0f129d045e7a25d750c9eb2995d488678986e5.tar.gz volse-hubzilla-0d0f129d045e7a25d750c9eb2995d488678986e5.tar.bz2 volse-hubzilla-0d0f129d045e7a25d750c9eb2995d488678986e5.zip | |
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'include')
| -rw-r--r-- | include/api.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/api.php b/include/api.php index 855e4efa3..691543907 100644 --- a/include/api.php +++ b/include/api.php @@ -719,14 +719,18 @@ if ($page<0) $page=0; $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); $max_id = (x($_REQUEST,'max_id')?$_REQUEST['max_id']:0); + $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); $start = $page*$count; //$include_entities = (x($_REQUEST,'include_entities')?$_REQUEST['include_entities']:false); + $sql_extra = ''; if ($max_id > 0) - $sql_extra = 'AND `item`.`id` <= '.intval($max_id); + $sql_extra .= ' AND `item`.`id` <= '.intval($max_id); + if ($exclude_replies > 0) + $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, @@ -1061,11 +1065,14 @@ $page = (x($_REQUEST,'page')?$_REQUEST['page']-1:0); if ($page<0) $page=0; $since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); + $exclude_replies = (x($_REQUEST,'exclude_replies')?1:0); //$since_id = 0;//$since_id = (x($_REQUEST,'since_id')?$_REQUEST['since_id']:0); $start = $page*$count; - if ($user_info['self']==1) $sql_extra = "AND `item`.`wall` = 1 "; + $sql_extra = ''; + if ($user_info['self']==1) $sql_extra .= " AND `item`.`wall` = 1 "; + if ($exclude_replies > 0) $sql_extra .= ' AND `item`.`parent` = `item`.`id`'; $r = q("SELECT `item`.*, `item`.`id` AS `item_id`, `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`, |