From 76657c46b87b66fe2bdd1fd9cf56a84016530811 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 17 Nov 2010 09:36:22 +0300 Subject: outputFeedList: properly generate last category; override order for the time being --- functions.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/functions.php b/functions.php index e2e984558..d8e411ece 100644 --- a/functions.php +++ b/functions.php @@ -4243,7 +4243,7 @@ $feedlist['items'] = array_merge($feedlist['items'], $cat['items']); } - if (get_pref($link, 'ENABLE_FEED_CATS')) { +/* if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) { $order_by_qpart = "order_id,category,unread DESC,title"; } else { @@ -4255,7 +4255,12 @@ } else { $order_by_qpart = "title"; } - } + } */ + + if ($enable_cats) + $order_by_qpart = "order_id,category,title"; + else + $order_by_qpart = "title"; $age_qpart = getMaxAgeSubquery(); @@ -4322,7 +4327,9 @@ $feed, $unread, $line['last_error'], $updated)); } - if (!$enable_cats) { + if ($enable_cats) { + array_push($feedlist['items'], $cat); + } else { $feedlist['items'] = array_merge($feedlist['items'], $cat['items']); } -- cgit v1.2.3