fix default sorting not taking score into account, remove unused SORT_HEADLINES_BY_FE...

diff --git a/include/functions.php b/include/functions.php
index c06208d1489bb8a40d34afbd8bf3e0d529d76a88..c05ee0a496bcacc47fbfe5d5005f1a0fa143d334 100644 (file)
--- 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";