public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 10:25:56 +00:00
Code Issues Releases Wiki Activity

move order_by to SQL override logic into a separate function

Browse Source
This commit is contained in:
Andrew Dolgov
2020-08-13 11:52:32 +03:00
parent 48be005774
commit dfa65e9374
3 changed files with 31 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
classes/feeds.php
View File

@@ -529,21 +529,7 @@ class Feeds extends Handler_Protected {
$reply['headlines'] = [];
$override_order = false;
$skip_first_id_check = false;
switch ($order_by) {
case "title":
$override_order = "ttrss_entries.title, date_entered, updated";
break;
case "date_reverse":
$override_order = "updated";
$skip_first_id_check = true;
break;
case "feed_dates":
$override_order = "updated DESC";
break;
}
list($override_order, $skip_first_id_check) = Feeds::order_to_override_query($order_by);
$ret = $this->format_headlines_list($feed, $method,
$view_mode, $limit, $cat_view, $offset,
@@ -2348,5 +2334,25 @@ class Feeds extends Handler_Protected {
return array($search_query_part, $search_words);
}
static function order_to_override_query($order) {
$query = "";
$skip_first_id = false;
switch ($order) {
case "title":
$query = "ttrss_entries.title, date_entered, updated";
break;
case "date_reverse":
$query = "updated";
$skip_first_id = true;
break;
case "feed_dates":
$query = "updated DESC";
break;
}
return [$query, $skip_first_id];
}
}