CDM: fix bug with feed icon being displayed in grouped mode for vfeeds

diff --git a/functions.php b/functions.php
index 8367dcaa1266576f6e756b1923111c9fcfee9584..e245d53fd5b1583360a4d9a29ea942ff93b9792a 100644 (file)
--- 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\"