From: Andrew Dolgov <fox@bah.org.ru>
Date: Thu, 9 Sep 2010 18:08:17 +0000 (+0400)
Subject: queryFeedHeadlines: properly handle Uncategorized category
X-Git-Tag: 1.4.3-proper~2
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=bfe5ddfc823f87f31934f8c3951f5ab0a62acd5a;p=tt-rss.git

queryFeedHeadlines: properly handle Uncategorized category
---

diff --git a/functions.php b/functions.php
index 05eb8590..2f895cd3 100644
--- a/functions.php
+++ b/functions.php
@@ -3455,8 +3455,11 @@
 						$query_strategy_part = "feed_id = '$feed'";
 					}
 				}
-			} else if ($feed == 0) { // starred virtual feed
+			} else if ($feed == 0 && !$cat_view) { // archive virtual feed
 				$query_strategy_part = "feed_id IS NULL";
+			} else if ($feed == 0 && $cat_view) { // uncategorized
+				$query_strategy_part = "cat_id IS NULL";
+				$vfeed_query_part = "ttrss_feeds.title AS feed_title,";
 			} else if ($feed == -1) { // starred virtual feed
 				$query_strategy_part = "marked = true";
 				$vfeed_query_part = "ttrss_feeds.title AS feed_title,";