From 965fb2af0db60231552c984f6f3d0ab3ef4084dc Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Thu, 14 Aug 2008 07:30:29 +0100
Subject: CDM: fix bug with feed icon being displayed in grouped mode for
 vfeeds

---
 functions.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'functions.php')

diff --git a/functions.php b/functions.php
index 8367dcaa1..e245d53fd 100644
--- a/functions.php
+++ b/functions.php
@@ -5012,7 +5012,7 @@
 							print "<tr class='feedTitle'><td colspan='7'>".
 								"<div style=\"float : right\">$feed_icon_img</div>".
 								"<a href=\"javascript:viewfeed($feed_id, '', false)\">".
-								$line["feed_title"]."</a> $vf_catchup_link:</td></tr>";
+								$line["feed_title"]."</a> $vf_catchup_link</td></tr>";
 						}
 					}
 
@@ -5131,8 +5131,11 @@
 
 					print "<div class=\"cdmHeader\">";
 
-					print "<div class=\"articleUpdated\">$updated_fmt $score_pic
-						<span style=\"cursor : pointer\" onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>
+					if (!get_pref($link, "VFEED_GROUP_BY_FEED") || !$line["feed_title"]) {
+						$cdm_feed_icon = "<span style=\"cursor : pointer\" onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
+					}
+
+					print "<div class=\"articleUpdated\">$updated_fmt $score_pic $cdm_feed_icon
 						</div>";
 
 					print "<span id=\"RTITLE-$id\" class=\"titleWrap$hlc_suffix\"><a class=\"title\" 
-- 
cgit v1.2.3