diff options
author | Richard Beales <[email protected]> | 2013-03-21 07:04:54 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-21 07:04:54 +0000 |
commit | f1fdfbea433c834ae7f09b4ef23f23d5efa069d4 (patch) | |
tree | 0b0b359f14767a9e2dea02a79f70de2bb30dda67 /classes/api.php | |
parent | 77accf45df3072bf0e3fe1e919bb75fc14313119 (diff) | |
parent | b74c51342896f4f01a742dcad82fc8afa753c036 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'classes/api.php')
-rw-r--r-- | classes/api.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/classes/api.php b/classes/api.php index 92e19e70a..5e7ec6573 100644 --- a/classes/api.php +++ b/classes/api.php @@ -194,11 +194,10 @@ class API extends Handler { $search = db_escape_string($_REQUEST["search"]); $search_mode = db_escape_string($_REQUEST["search_mode"]); - $match_on = db_escape_string($_REQUEST["match_on"]); $headlines = $this->api_get_headlines($this->link, $feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, false, - $include_attachments, $since_id, $search, $search_mode, $match_on, + $include_attachments, $since_id, $search, $search_mode, $include_nested, $sanitize_content); print $this->wrap(self::STATUS_OK, $headlines); @@ -584,11 +583,11 @@ class API extends Handler { static function api_get_headlines($link, $feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order, $include_attachments, $since_id, - $search = "", $search_mode = "", $match_on = "", + $search = "", $search_mode = "", $include_nested = false, $sanitize_content = true) { $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, - $view_mode, $is_cat, $search, $search_mode, $match_on, + $view_mode, $is_cat, $search, $search_mode, $order, $offset, 0, false, $since_id, $include_nested); $result = $qfh_ret[0]; |