diff options
| author | Andrew Dolgov <[email protected]> | 2012-10-15 10:14:54 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2012-10-15 10:14:54 +0400 |
| commit | 835fb294a67861da52fc00a200020fadd6269e5e (patch) | |
| tree | 3b84c11348a6b2536f4ad3b71ec1872128a3e9d8 /include | |
| parent | 12e6de72963dd6eff3da0ed53512c424b6de1824 (diff) | |
allow archived entries in labels and several other vfeeds
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/functions.php b/include/functions.php index dacd45d02..05c36b02b 100644 --- a/include/functions.php +++ b/include/functions.php @@ -2437,6 +2437,8 @@ } else if ($feed == -1) { // starred virtual feed $query_strategy_part = "marked = true"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; + $allow_archived = true; + } else if ($feed == -2) { // published virtual feed OR labels category if (!$cat_view) { @@ -2457,6 +2459,7 @@ } else if ($feed == -6) { // recently read $query_strategy_part = "unread = false AND last_read IS NOT NULL"; $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; + $allow_archived = true; if (!$override_order) $override_order = "last_read DESC"; } else if ($feed == -3) { // fresh virtual feed @@ -2483,9 +2486,10 @@ $vfeed_query_part = "ttrss_feeds.title AS feed_title,"; $ext_tables_part = ",ttrss_labels2,ttrss_user_labels2"; + $allow_archived = true; } else { - $query_strategy_part = "id > 0"; // dumb + $query_strategy_part = "true"; } if (get_pref($link, "SORT_HEADLINES_BY_FEED_DATE", $owner_uid)) { @@ -2554,7 +2558,7 @@ $feed_check_qpart = "ttrss_user_entries.feed_id = ttrss_feeds.id AND"; } else { - $from_qpart = "ttrss_entries,ttrss_user_entries$ext_tables_part + $from_qpart = "ttrss_entries$ext_tables_part,ttrss_user_entries LEFT JOIN ttrss_feeds ON (feed_id = ttrss_feeds.id)"; } |