use getCategoryUnread in outputFeedList, misc fixes

1 files changed, 2 insertions, 14 deletions

diff --git a/backend.php b/backend.php
index 428939fe9..583ab658f 100644
--- a/backend.php
+++ b/backend.php
@@ -364,21 +364,9 @@
 						$ellipsis = "";
 					}
 
-					if ($cat_id) {
-						$cat_id_qpart = "cat_id = '$cat_id'";
-					} else {
-						$cat_id_qpart = "cat_id IS NULL";
-					}
-
-					$tmp_result = db_query($link, "SELECT count(int_id) AS unread
-						FROM ttrss_user_entries,ttrss_feeds WHERE
-							unread = true AND
-							feed_id = ttrss_feeds.id AND $cat_id_qpart AND
-							ttrss_user_entries.owner_uid = " . $_SESSION["uid"]);
-
-					$cat_unread = db_fetch_result($tmp_result, 0, "unread");
-
 					$cat_id = sprintf("%d", $cat_id);
+
+					$cat_unread = getCategoryUnread($link, $cat_id);
 					
 					print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
 						<a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>