diff options
| author | Andrew Dolgov <[email protected]> | 2010-09-09 22:08:55 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2010-09-09 22:08:55 +0400 |
| commit | 432c64caced5f7cd4ad534a0f2b04acf059b6e8c (patch) | |
| tree | 5830e3bdf92171db6faef4bf0dbaf19f377a8d6c | |
| parent | 22933e5e381f241365d833a7e1da6185816688bf (diff) | |
| parent | bfe5ddfc823f87f31934f8c3951f5ab0a62acd5a (diff) | |
Merge branch 'master' into digest-experimental
| -rw-r--r-- | functions.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/functions.php b/functions.php index ce1a06a62..735fd2c73 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,"; |