valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

queryfeedheadlines: remove disable_offsets hack

This commit is contained in:
Andrew Dolgov 2015-09-15 12:33:58 +03:00
parent 6b860bd9d2
commit 94b8ce6cec
2 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/api.php
View File

@ -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);

10
include/functions2.php
View File

@ -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,