From 7b20c977802b3ec33f05dd66814ebc9d995bc4a3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Mon, 18 Oct 2010 18:32:26 +0400
Subject: [PATCH] order feed output by date_entered instead of updated to
 properly keep new stuff topmost; support REVERSE_HEADLINES in more headline
 output modes

---
 backend.php   | 16 ++++++++++++----
 functions.php |  6 +++---
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/backend.php b/backend.php
index c30629167..06c1ecbd9 100644
--- a/backend.php
+++ b/backend.php
@@ -319,18 +319,26 @@
 			switch ($order_by) {
 				case "date":
 					if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
-						$override_order = "updated";
+						$override_order = "date_entered";
 					} else {	
-						$override_order = "updated DESC";
+						$override_order = "date_entered DESC";
 					}
 					break;
 
 				case "title":
-					$override_order = "updated DESC";
+					if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
+						$override_order = "title DESC, date_entered";
+					} else {
+						$override_order = "title, date_entered DESC";
+					}
 					break;
 
 				case "score":
-					$override_order = "score DESC";
+					if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
+						$override_order = "score, date_entered";
+					} else {
+						$override_order = "score DESC, date_entered DESC";
+					}
 					break;
 			}
 
diff --git a/functions.php b/functions.php
index af5a64f37..a669814df 100644
--- a/functions.php
+++ b/functions.php
@@ -3512,9 +3512,9 @@
 			}
 
 			if (get_pref($link, 'REVERSE_HEADLINES', $owner_uid)) {
-				$order_by = "updated";
+				$order_by = "date_entered";
 			} else {	
-				$order_by = "updated DESC";
+				$order_by = "date_entered DESC";
 			}
 
 			if ($view_mode != "noscores") {
@@ -3645,7 +3645,7 @@
 		if (!$limit) $limit = 30;
 
 		$qfh_ret = queryFeedHeadlines($link, $feed, 
-			$limit, false, $is_cat, $search, $search_mode, $match_on, "updated DESC", 0,
+			$limit, false, $is_cat, $search, $search_mode, $match_on, "date_entered DESC", 0,
 			$owner_uid);
 
 		$result = $qfh_ret[0];