From: Andrew Dolgov Date: Tue, 15 Sep 2015 09:33:58 +0000 (+0300) Subject: queryfeedheadlines: remove disable_offsets hack X-Git-Tag: 16.3~111 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=94b8ce6cec3cdc8548cdfa7d1cd0d5d06a518886;p=tt-rss.git queryfeedheadlines: remove disable_offsets hack --- diff --git a/classes/api.php b/classes/api.php index 2d420e52..08c1846d 100644 --- a/classes/api.php +++ b/classes/api.php @@ -686,8 +686,7 @@ class API extends Handler { "offset" => $offset, "since_id" => $since_id, "include_children" => $include_nested, - "check_first_id" => $check_first_id, - "api_request" => true + "check_first_id" => $check_first_id ); $qfh_ret = queryFeedHeadlines($params); diff --git a/include/functions2.php b/include/functions2.php index fb8a6a3d..bd1f9b86 100644 --- a/include/functions2.php +++ b/include/functions2.php @@ -465,7 +465,6 @@ $override_vfeed = isset($params["override_vfeed"]) ? $params["override_vfeed"] : false; $start_ts = isset($params["start_ts"]) ? $params["start_ts"] : false; $check_first_id = isset($params["check_first_id"]) ? $params["check_first_id"] : false; - $api_request = isset($params["api_request"]) ? $params["api_request"] : false; $ext_tables_part = ""; $query_strategy_part = ""; @@ -494,7 +493,6 @@ } $view_query_part = ""; - $disable_offsets = false; if ($view_mode == "adaptive") { if ($search) { @@ -508,7 +506,6 @@ if ($unread > 0) { $view_query_part = " unread = true AND "; - $disable_offsets = !$api_request && get_pref("CDM_AUTO_CATCHUP") && get_pref("CDM_EXPANDED"); } } } @@ -527,7 +524,6 @@ if ($view_mode == "unread" && $feed != -6) { $view_query_part = " unread = true AND "; - $disable_offsets = !$api_request && get_pref("CDM_AUTO_CATCHUP") && get_pref("CDM_EXPANDED"); } if ($limit > 0) { @@ -735,7 +731,7 @@ $sanity_interval_qpart = "date_entered >= DATE_SUB(NOW(), INTERVAL 1 hour) AND"; } - if (!$search && !$disable_offsets) { + if (!$search) { // if previous topmost article id changed that means our current pagination is no longer valid $query = "SELECT DISTINCT ttrss_feeds.title, @@ -775,10 +771,6 @@ } } - if ($disable_offsets) { - $offset_query_part = ""; - } - $query = "SELECT DISTINCT date_entered, guid,