valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2008-08-13 08:50:28 +01:00
parent 074bf20c7f
commit 338ce36c21
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions.php
View File

@ -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");

16
tt-rss.js
View File

@ -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);
}
}