From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Wed, 13 Aug 2008 07:50:28 +0000 (+0100)
Subject: fix break when calling catchupFeedInGroup() in grouped vfeed mode on a feed with... 
X-Git-Tag: 1.2.26~7
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=338ce36c218220f335546da724deca5f215720d9;p=tt-rss.git

fix break when calling catchupFeedInGroup() in grouped vfeed mode on a feed with a single quote in a name
---

diff --git a/functions.php b/functions.php
index f2800552..8367dcaa 100644
--- 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 870c6402..77c4730a 100644
--- 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);
 	}
 }