diff options
author | Andrew Dolgov <[email protected]> | 2015-11-21 22:20:00 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2015-11-21 22:20:00 +0300 |
commit | 19e47ad60bc390b52cfe1545a6d401545e6568a5 (patch) | |
tree | d997e1a09810d4bee5e303610bf4366955763cb5 /classes | |
parent | aa03bac42490673b4cd027c779655a027b1dd0fc (diff) |
queryFeedHeadlines: don't check first_id when sorting by oldest first
Diffstat (limited to 'classes')
-rwxr-xr-x[-rw-r--r--] | classes/api.php | 10 | ||||
-rwxr-xr-x[-rw-r--r--] | classes/feeds.php | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/classes/api.php b/classes/api.php index 08c1846d2..dfe9ef6cb 100644..100755 --- a/classes/api.php +++ b/classes/api.php @@ -210,6 +210,8 @@ class API extends Handler { $_SESSION['hasSandbox'] = $has_sandbox; + $skip_first_id_check = false; + $override_order = false; switch ($_REQUEST["order_by"]) { case "title": @@ -217,6 +219,7 @@ class API extends Handler { break; case "date_reverse": $override_order = "score DESC, date_entered, updated"; + $skip_first_id_check = true; break; case "feed_dates": $override_order = "updated DESC"; @@ -230,7 +233,7 @@ class API extends Handler { list($headlines, $headlines_header) = $this->api_get_headlines($feed_id, $limit, $offset, $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $override_order, $include_attachments, $since_id, $search, - $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id); + $include_nested, $sanitize_content, $force_update, $excerpt_length, $check_first_id, $skip_first_id_check); if ($include_header) { $this->wrap(self::STATUS_OK, array($headlines_header, $headlines)); @@ -644,7 +647,7 @@ class API extends Handler { $filter, $is_cat, $show_excerpt, $show_content, $view_mode, $order, $include_attachments, $since_id, $search = "", $include_nested = false, $sanitize_content = true, - $force_update = false, $excerpt_length = 100, $check_first_id = false) { + $force_update = false, $excerpt_length = 100, $check_first_id = false, $skip_first_id_check = false) { if ($force_update && $feed_id > 0 && is_numeric($feed_id)) { // Update the feed if required with some basic flood control @@ -686,7 +689,8 @@ class API extends Handler { "offset" => $offset, "since_id" => $since_id, "include_children" => $include_nested, - "check_first_id" => $check_first_id + "check_first_id" => $check_first_id, + "skip_first_id_check" => $skip_first_id_check ); $qfh_ret = queryFeedHeadlines($params); diff --git a/classes/feeds.php b/classes/feeds.php index c3cb72da8..07a18741d 100644..100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -148,7 +148,8 @@ class Feeds extends Handler_Protected { private function format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, $vgr_last_feed = false, - $override_order = false, $include_children = false, $check_first_id = false) { + $override_order = false, $include_children = false, $check_first_id = false, + $skip_first_id_check = false) { $disable_cache = false; @@ -252,7 +253,8 @@ class Feeds extends Handler_Protected { "override_order" => $override_order, "offset" => $offset, "include_children" => $include_children, - "check_first_id" => $check_first_id + "check_first_id" => $check_first_id, + "skip_first_id_check" => $skip_first_id_check ); $qfh_ret = queryFeedHeadlines($params); @@ -903,6 +905,7 @@ class Feeds extends Handler_Protected { $reply['headlines'] = array(); $override_order = false; + $skip_first_id_check = false; switch ($order_by) { case "title": @@ -910,6 +913,7 @@ class Feeds extends Handler_Protected { break; case "date_reverse": $override_order = "score DESC, date_entered, updated"; + $skip_first_id_check = true; break; case "feed_dates": $override_order = "updated DESC"; @@ -920,7 +924,7 @@ class Feeds extends Handler_Protected { $ret = $this->format_headlines_list($feed, $method, $view_mode, $limit, $cat_view, $next_unread_feed, $offset, - $vgroup_last_feed, $override_order, true, $check_first_id); + $vgroup_last_feed, $override_order, true, $check_first_id, $skip_first_id_check); //$topmost_article_ids = $ret[0]; $headlines_count = $ret[1]; |