disable headlines grouping for recently read vfeed

diff --git a/classes/feeds.php b/classes/feeds.php
index ea3967911f1a96bbccd807f5d38d0ed4e1dc71bc..c90b11d5ddc3794035521a481663f5610f4b524e 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -248,6 +248,8 @@ class Feeds extends Handler_Protected {
                                false, 0, $include_children);
                }
 
+               $vfeed_group_enabled = get_pref("VFEED_GROUP_BY_FEED") && $feed != -6;
+
                if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H1", $timing_info);
 
                $result = $qfh_ret[0];
@@ -421,7 +423,7 @@ class Feeds extends Handler_Protected {
 
                                if (!get_pref('COMBINED_DISPLAY_MODE')) {
 
-                                       if (get_pref('VFEED_GROUP_BY_FEED')) {
+                                       if ($vfeed_group_enabled) {
                                                if ($feed_id != $vgroup_last_feed && $line["feed_title"]) {
 
                                                        $cur_feed_title = $line["feed_title"];
@@ -472,7 +474,7 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= "</div>";
 
-                                       if (!get_pref('VFEED_GROUP_BY_FEED')) {
+                                       if (!$vfeed_group_enabled) {
                                                if (@$line["feed_title"]) {
                                                        $rgba = @$rgba_cache[$feed_id];
 
@@ -491,7 +493,7 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= $score_pic;
 
-                                       if ($line["feed_title"] && !get_pref('VFEED_GROUP_BY_FEED')) {
+                                       if ($line["feed_title"] && !$vfeed_group_enabled) {
 
                                                $reply['content'] .= "<span onclick=\"viewfeed($feed_id)\"
                                                        style=\"cursor : pointer\"
@@ -516,7 +518,7 @@ class Feeds extends Handler_Protected {
                                                $line = $p->hook_render_article_cdm($line);
                                        }
 
-                                       if (get_pref('VFEED_GROUP_BY_FEED') && $line["feed_title"]) {
+                                       if ($vfeed_group_enabled && $line["feed_title"]) {
                                                if ($feed_id != $vgroup_last_feed) {
 
                                                        $cur_feed_title = $line["feed_title"];
@@ -592,7 +594,7 @@ class Feeds extends Handler_Protected {
 
                                        $reply['content'] .= "</span>";
 
-                                       if (!get_pref('VFEED_GROUP_BY_FEED')) {
+                                       if (!$vfeed_group_enabled) {
                                                if (@$line["feed_title"]) {
                                                        $rgba = @$rgba_cache[$feed_id];
 

diff --git a/include/functions2.php b/include/functions2.php
index 7c35b22cb1a2639f29f95f90d80c75ea6a6f5bd4..ed0963c46e34992f62baafcb472656d61cdff511 100644 (file)
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -583,6 +583,7 @@
                                $query_strategy_part = "unread = false AND last_read IS NOT NULL";
                                $vfeed_query_part = "ttrss_feeds.title AS feed_title,";
                                $allow_archived = true;
+                               $ignore_vfeed_group = true;
 
                                if (!$override_order) $override_order = "last_read DESC";