diff options
author | Andrew Dolgov <[email protected]> | 2020-08-13 11:52:32 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2020-08-13 11:52:32 +0300 |
commit | dfa65e9374a52441d9c7f2d9187dc831b705858e (patch) | |
tree | 2fc96377d00faea15884191966e209f6471a01ce /classes/feeds.php | |
parent | 48be0057744944432aab6f0235068250f96f0a8e (diff) |
move order_by to SQL override logic into a separate function
Diffstat (limited to 'classes/feeds.php')
-rwxr-xr-x | classes/feeds.php | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index 5601a500d..86dd750ec 100755 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -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]; + } } |