mirrors/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/fox/tt-rss.git synced 2025-10-08 17:41:03 +02:00
Code Issues Projects Releases Wiki Activity

outputFeedList: properly generate last category; override order for the time being

Browse Source
This commit is contained in:
Andrew Dolgov 2010-11-17 09:36:22 +03:00
parent ea3a4b3496
commit 76657c46b8
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
functions.php
View File

@ -4243,7 +4243,7 @@
$feedlist['items'] = array_merge($feedlist['items'], $cat['items']); $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")) { if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
$order_by_qpart = "order_id,category,unread DESC,title"; $order_by_qpart = "order_id,category,unread DESC,title";
} else { } else {
@ -4255,7 +4255,12 @@
} else { } else {
$order_by_qpart = "title"; $order_by_qpart = "title";
} }
} } */
if ($enable_cats)
$order_by_qpart = "order_id,category,title";
else
$order_by_qpart = "title";
$age_qpart = getMaxAgeSubquery(); $age_qpart = getMaxAgeSubquery();
@ -4322,7 +4327,9 @@
$feed, $unread, $line['last_error'], $updated)); $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']); $feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
} }