valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into digest-experimental

This commit is contained in:
Andrew Dolgov 2010-09-09 22:08:55 +04:00
parent 22933e5e38 bfe5ddfc82
commit 432c64cace
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
functions.php
View File

@ -3455,8 +3455,11 @@
$query_strategy_part = "feed_id = '$feed'"; $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"; $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 } else if ($feed == -1) { // starred virtual feed
$query_strategy_part = "marked = true"; $query_strategy_part = "marked = true";
$vfeed_query_part = "ttrss_feeds.title AS feed_title,"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,";