From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 3 Apr 2013 12:06:54 +0000 (+0400)
Subject: fix default sorting not taking score into account, remove unused SORT_HEADLINES_BY_FE... 
X-Git-Tag: 1.7.7~9
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=686852d548a1c078bc4e10d6533443e2092bc1fd;p=tt-rss.git

fix default sorting not taking score into account, remove unused SORT_HEADLINES_BY_FEED_DATE remnant
---

diff --git a/include/functions.php b/include/functions.php
index c06208d1..c05ee0a4 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2422,13 +2422,7 @@
 				$query_strategy_part = "true";
 			}
 
-			if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) {
-				$date_sort_field = "updated";
-			} else {
-				$date_sort_field = "date_entered";
-			}
-
-			$order_by = "$date_sort_field DESC, updated DESC";
+			$order_by = "score DESC, date_entered DESC, updated DESC";
 
 			if ($view_mode == "unread_first") {
 				$order_by = "unread DESC, $order_by";