From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Tue, 1 Aug 2006 05:04:31 +0000 (+0100)
Subject: generated feeds always sorted by updated desc
X-Git-Tag: schema_freeze_for_1.2.2~47
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=e939722a14b8c806d74e611336f3472a3546f06b;p=tt-rss.git

generated feeds always sorted by updated desc
---

diff --git a/backend.php b/backend.php
index 73bcea6a..1aa0f393 100644
--- a/backend.php
+++ b/backend.php
@@ -869,12 +869,14 @@
 				$search_q = "&q=$search&m=$match_on&smode=$search_mode";
 			}
 
-			print "&nbsp;
-				<a target=\"_new\" 
-					href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\"
-					<img class=\"noborder\" 
-						alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\">
-				</a>";
+			if (!$bottom) {
+				print "&nbsp;
+					<a target=\"_new\" 
+						href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\"
+						<img class=\"noborder\" 
+							alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\">
+					</a>";
+			}
 				
 			print "</td>";
 			print "</tr></table>";
diff --git a/functions.php b/functions.php
index e0f2cd5e..987b8c9b 100644
--- a/functions.php
+++ b/functions.php
@@ -1958,7 +1958,7 @@
 		print "</runtime-info>";
 	}
 
-	function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on) {
+	function queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, $search, $search_mode, $match_on, $override_order = false) {
 
 			if ($search) {
 			
@@ -2111,6 +2111,10 @@
 			} else {	
 				$order_by = "updated DESC";
 			}
+
+			if ($override_order) {
+				$order_by = $override_order;
+			}
 	
 			$feed_title = "";
 
@@ -2232,7 +2236,7 @@
 		$search, $search_mode, $match_on) {
 
 		$qfh_ret = queryFeedHeadlines($link, $feed, 
-				30, false, $is_cat, $search, $search_mode, $match_on);
+				30, false, $is_cat, $search, $search_mode, $match_on, "updated DESC");
 
 		$result = $qfh_ret[0];
 		$feed_title = htmlspecialchars($qfh_ret[1]);