disable SORT_HEADLINES_BY_FEED_DATE; replace with a toolbar newest first order

[tt-rss.git] / classes / feeds.php

diff --git a/classes/feeds.php b/classes/feeds.php
index 1086dc493dfd062509c3678b84b77baa32fccaff..fcac6e4d6ee856671e6579326f03c6bd82f8034e 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -862,35 +862,12 @@ class Feeds extends Handler_Protected {
 
                $override_order = false;
 
-               if (get_pref($this->link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
-                       $date_sort_field = "updated";
-               } else {
-                       $date_sort_field = "date_entered";
-               }
-
                switch ($order_by) {
-                       case "date":
-                               if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
-                                       $override_order = "$date_sort_field, updated";
-                               } else {
-                                       $override_order = "$date_sort_field DESC, updated DESC";
-                               }
-                               break;
-
-                       case "title":
-                               if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
-                                       $override_order = "title DESC, $date_sort_field, updated";
-                               } else {
-                                       $override_order = "title, $date_sort_field DESC, updated DESC";
-                               }
+                       case "date_reverse":
+                               $override_order = "date_entered DESC, updated";
                                break;
-
-                       case "score":
-                               if (get_pref($this->link, 'REVERSE_HEADLINES', $owner_uid)) {
-                                       $override_order = "score, $date_sort_field, updated";
-                               } else {
-                                       $override_order = "score DESC, $date_sort_field DESC, updated DESC";
-                               }
+                       case "feed_dates":
+                               $override_order = "updated DESC";
                                break;
                }