From 66ca7c30975a0435f7c8a2aa6c1009f201ccec8c Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 28 Mar 2013 15:28:37 +0400 Subject: api: add include_empty to getCategories/getFeedTree --- classes/pref/feeds.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'classes/pref') diff --git a/classes/pref/feeds.php b/classes/pref/feeds.php index 362d046e8..1ec0b7b54 100644 --- a/classes/pref/feeds.php +++ b/classes/pref/feeds.php @@ -33,8 +33,10 @@ class Pref_Feeds extends Handler_Protected { if ($search) $search_qpart = " AND LOWER(title) LIKE LOWER('%$search%')"; - $show_empty_cats = $_REQUEST['mode'] != 2 && !$search && - get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'); + // first one is set by API + $show_empty_cats = $_REQUEST['force_show_empty'] || + ($_REQUEST['mode'] != 2 && !$search && + get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS')); $items = array(); @@ -183,8 +185,9 @@ class Pref_Feeds extends Handler_Protected { } if ($enable_cats) { - $show_empty_cats = $_REQUEST['mode'] != 2 && !$search && - get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS'); + $show_empty_cats = $_REQUEST['force_show_empty'] || + ($_REQUEST['mode'] != 2 && !$search && + get_pref($this->link, '_PREFS_SHOW_EMPTY_CATS')); $result = db_query($this->link, "SELECT id, title FROM ttrss_feed_categories WHERE owner_uid = " . $_SESSION["uid"] . " AND parent_cat IS NULL ORDER BY order_id, title"); -- cgit v1.2.3