From 8aa01d7989807057b2bcac8916c0d1bc627268a8 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 28 Mar 2013 20:51:06 +0400
Subject: disable SORT_HEADLINES_BY_FEED_DATE; replace with a toolbar newest
 first order

---
 classes/feeds.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index 6aca206a2..fcac6e4d6 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -862,15 +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_reverse":
-				$override_order = "$date_sort_field, updated";
+				$override_order = "date_entered DESC, updated";
+				break;
+			case "feed_dates":
+				$override_order = "updated DESC";
 				break;
 		}
 
-- 
cgit v1.2.3