summaryrefslogtreecommitdiff
path: root/functions.php
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2010-09-09 22:08:17 +0400
committerAndrew Dolgov <[email protected]>2010-09-09 22:08:17 +0400
commitbfe5ddfc823f87f31934f8c3951f5ab0a62acd5a (patch)
tree6fcae35406f360f56d634eb5a4a22a09d5479c7d /functions.php
parent5fa173729e21c4b0a222541a0f9e939711cf1989 (diff)
queryFeedHeadlines: properly handle Uncategorized category
Diffstat (limited to 'functions.php')
-rw-r--r--functions.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/functions.php b/functions.php
index 05eb85909..2f895cd30 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,";