|
|
|
@ -4262,7 +4262,6 @@
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* if (get_pref($link, 'ENABLE_FEED_CATS')) {
|
|
|
|
|
if (get_pref($link, "FEEDS_SORT_BY_UNREAD")) {
|
|
|
|
|
$order_by_qpart = "order_id,category,unread DESC,title";
|
|
|
|
@ -4277,6 +4276,8 @@
|
|
|
|
|
}
|
|
|
|
|
} */
|
|
|
|
|
|
|
|
|
|
/* real feeds */
|
|
|
|
|
|
|
|
|
|
if ($enable_cats)
|
|
|
|
|
$order_by_qpart = "ttrss_feed_categories.order_id,category,
|
|
|
|
|
ttrss_feeds.order_id,title";
|
|
|
|
@ -4304,7 +4305,7 @@
|
|
|
|
|
|
|
|
|
|
$actid = $_REQUEST["actid"];
|
|
|
|
|
|
|
|
|
|
/* real feeds */
|
|
|
|
|
if (db_num_rows($result) > 0) {
|
|
|
|
|
|
|
|
|
|
$category = "";
|
|
|
|
|
|
|
|
|
@ -4354,6 +4355,8 @@
|
|
|
|
|
$feedlist['items'] = array_merge($feedlist['items'], $cat['items']);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return $feedlist;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|