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/handler/public.php | |
| parent | 48be0057744944432aab6f0235068250f96f0a8e (diff) | |
move order_by to SQL override logic into a separate function
Diffstat (limited to 'classes/handler/public.php')
| -rwxr-xr-x | classes/handler/public.php | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/classes/handler/public.php b/classes/handler/public.php index c378de9bf..378e4b6c6 100755 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -12,24 +12,16 @@ class Handler_Public extends Handler { if (!$limit) $limit = 60; - $date_sort_field = "date_entered DESC, updated DESC"; + list($override_order, $skip_first_id_check) = Feeds::order_to_override_query($order); - if ($feed == -2 && !$is_cat) { - $date_sort_field = "last_published DESC"; - } else if ($feed == -1 && !$is_cat) { - $date_sort_field = "last_marked DESC"; - } + if (!$override_order) { + $override_order = "date_entered DESC, updated DESC"; - switch ($order) { - case "title": - $date_sort_field = "ttrss_entries.title, date_entered, updated"; - break; - case "date_reverse": - $date_sort_field = "updated"; - break; - case "feed_dates": - $date_sort_field = "updated DESC"; - break; + if ($feed == -2 && !$is_cat) { + $override_order = "last_published DESC"; + } else if ($feed == -1 && !$is_cat) { + $override_order = "last_marked DESC"; + } } $params = array( @@ -39,7 +31,7 @@ class Handler_Public extends Handler { "view_mode" => $view_mode, "cat_view" => $is_cat, "search" => $search, - "override_order" => $date_sort_field, + "override_order" => $override_order, "include_children" => true, "ignore_vfeed_group" => true, "offset" => $offset, |