generated feeds always sorted by updated desc

This commit is contained in:
Andrew Dolgov 2006-08-01 06:04:31 +01:00
parent 234e467cad
commit e939722a14
2 changed files with 14 additions and 8 deletions

View file

@ -869,12 +869,14 @@
$search_q = "&q=$search&m=$match_on&smode=$search_mode"; $search_q = "&q=$search&m=$match_on&smode=$search_mode";
} }
print "  if (!$bottom) {
<a target=\"_new\" print "&nbsp;
href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\" <a target=\"_new\"
<img class=\"noborder\" href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\"
alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\"> <img class=\"noborder\"
</a>"; alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\">
</a>";
}
print "</td>"; print "</td>";
print "</tr></table>"; print "</tr></table>";

View file

@ -1958,7 +1958,7 @@
print "</runtime-info>"; 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) { if ($search) {
@ -2112,6 +2112,10 @@
$order_by = "updated DESC"; $order_by = "updated DESC";
} }
if ($override_order) {
$order_by = $override_order;
}
$feed_title = ""; $feed_title = "";
if ($search && $search_mode == "all_feeds") { if ($search && $search_mode == "all_feeds") {
@ -2232,7 +2236,7 @@
$search, $search_mode, $match_on) { $search, $search_mode, $match_on) {
$qfh_ret = queryFeedHeadlines($link, $feed, $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]; $result = $qfh_ret[0];
$feed_title = htmlspecialchars($qfh_ret[1]); $feed_title = htmlspecialchars($qfh_ret[1]);