]> git.wh0rd.org - tt-rss.git/commitdiff
queryFeedHeadlines: properly handle Uncategorized category
authorAndrew Dolgov <fox@bah.org.ru>
Thu, 9 Sep 2010 18:08:17 +0000 (22:08 +0400)
committerAndrew Dolgov <fox@bah.org.ru>
Thu, 9 Sep 2010 18:08:17 +0000 (22:08 +0400)
functions.php

index 05eb85909c9e6c54b3b8fbe64448e5a78419c5ca..2f895cd3019082099fb764b81a053b8b3330ef80 100644 (file)
                                                $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,";