servers
/
ttrss
mirror of https://tt-rss.org/git/tt-rss.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

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']);
}
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']);
}