valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feeds: fix JSON output when there are no subscribed feeds

This commit is contained in:
Andrew Dolgov 2010-11-19 15:34:14 +03:00
parent 2f88ca8c11
commit 4d65b7dfc5
1 changed files with 47 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
functions.php
View File

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