Merge branch 'master' into digest-experimental

[tt-rss.git] / functions.php

diff --git a/functions.php b/functions.php
index ce1a06a6219643b2a8ce38dd84388f57ae50ef21..735fd2c73b66f23217fec5e7d2ab025e6c77234b 100644 (file)
--- 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,";