From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 10 Feb 2013 07:40:03 +0000 (+0400)
Subject: api: block real categories with 0 feeds to appear in getCategories
X-Git-Tag: 1.7.0~5
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=d49dfa381e3b74e09839d9d858f410fa6ec707d2;p=tt-rss.git

api: block real categories with 0 feeds to appear in getCategories
---

diff --git a/classes/api.php b/classes/api.php
index a4294e02..4b24b011 100644
--- a/classes/api.php
+++ b/classes/api.php
@@ -131,24 +131,29 @@ class API extends Handler {
 			$nested_qpart = "true";
 
 		$result = db_query($this->link, "SELECT
-				id, title, order_id FROM ttrss_feed_categories
+				id, title, order_id, (SELECT COUNT(id) FROM
+				ttrss_feeds WHERE
+				ttrss_feed_categories.id IS NOT NULL AND cat_id = ttrss_feed_categories.id) AS num_feeds
+			FROM ttrss_feed_categories
 			WHERE $nested_qpart AND owner_uid = " .
 			$_SESSION["uid"]);
 
 		$cats = array();
 
 		while ($line = db_fetch_assoc($result)) {
-			$unread = getFeedUnread($this->link, $line["id"], true);
+			if ($line["num_feeds"] > 0) {
+				$unread = getFeedUnread($this->link, $line["id"], true);
 
-			if ($enable_nested)
-				$unread += getCategoryChildrenUnread($this->link, $line["id"]);
+				if ($enable_nested)
+					$unread += getCategoryChildrenUnread($this->link, $line["id"]);
 
-			if ($unread || !$unread_only) {
-				array_push($cats, array("id" => $line["id"],
-					"title" => $line["title"],
-					"unread" => $unread,
-					"order_id" => (int) $line["order_id"],
-				));
+				if ($unread || !$unread_only) {
+					array_push($cats, array("id" => $line["id"],
+						"title" => $line["title"],
+						"unread" => $unread,
+						"order_id" => (int) $line["order_id"],
+					));
+				}
 			}
 		}