summaryrefslogtreecommitdiff
path: root/classes
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2014-03-13 01:07:52 +0400
committerAndrew Dolgov <[email protected]>2014-03-13 01:07:52 +0400
commitad593e43933d4908c361d5bc23d448ebd931eae6 (patch)
tree7fe13d12a6d0be3c8162b396ccec0b681e2d6c22 /classes
parent307e24ca81b95fc76a2a26d3c1cd872baac33b16 (diff)
disable headlines grouping for recently read vfeed
Diffstat (limited to 'classes')
-rw-r--r--classes/feeds.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index ea3967911..c90b11d5d 100644
--- 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];