Merge branch 'master' into digest-experimental
This commit is contained in:
commit
432c64cace
1 changed files with 4 additions and 1 deletions
|
@ -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,";
|
||||
|
|
Loading…
Reference in a new issue