fix break when calling catchupFeedInGroup() in grouped vfeed mode on a feed with...

diff --git a/functions.php b/functions.php
index f2800552fc09a37eb9f92bd0592af2a6567832e0..8367dcaa1266576f6e756b1923111c9fcfee9584 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -5007,7 +5007,7 @@
 
                                                        $cur_feed_title = htmlspecialchars($cur_feed_title);
 
-                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id, \"$cur_feed_title\");' href='#'>mark as read</a>)";
+                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>mark as read</a>)";
 
                                                        print "<tr class='feedTitle'><td colspan='7'>".
                                                                "<div style=\"float : right\">$feed_icon_img</div>".
@@ -5088,7 +5088,7 @@
 
                                                        $cur_feed_title = htmlspecialchars($cur_feed_title);
 
-                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id, \"$cur_feed_title\");' href='#'>mark as read</a>)";
+                                                       $vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id);' href='#'>mark as read</a>)";
 
                                                        $has_feed_icon = is_file(ICONS_DIR . "/$feed_id.ico");
 

diff --git a/tt-rss.js b/tt-rss.js
index 870c64028b0c386ecd0e5030259d1622aaaf7333..77c4730ac53d55224d8c8fc83eb3c0df39b42f73 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -718,12 +718,20 @@ function catchupCurrentFeed() {
        }
 }
 
-function catchupFeedInGroup(id, title) {
+function catchupFeedInGroup(id) {
 
-       var str = __("Mark all articles in %s as read?").replace("%s", title);
+       try {
 
-       if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
-               return viewCurrentFeed('MarkAllReadGR:' + id)
+               var title = getFeedName(id);
+
+               var str = __("Mark all articles in %s as read?").replace("%s", title);
+
+               if (getInitParam("confirm_feed_catchup") != 1 || confirm(str)) {
+                       return viewCurrentFeed('MarkAllReadGR:' + id)
+               }
+
+       } catch (e) {
+               exception_error("catchupFeedInGroup", e);
        }
 }