From: Joey Hess <joey@kitenet.net>
Date: Mon, 24 Jan 2011 21:01:01 +0000 (-0400)
Subject: inline: Fix regression in feed titles. Closes: #610878 (Thanks, Paul Wise)
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/80452eba92ab4141bf78de90d36015eabf37777a?hp=-c;ds=sidebyside

inline: Fix regression in feed titles. Closes: #610878 (Thanks, Paul Wise)
---

80452eba92ab4141bf78de90d36015eabf37777a
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d89e14197..285077204 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -294,11 +294,11 @@ sub preprocess_inline (@) {
 	if ($feeds) {
 		if ($rss) {
 			$rssurl=abs2rel($feedbase."rss".$feednum, dirname(htmlpage($params{destpage})));
-			$rssdesc = gettext("%s (RSS feed)", $desc);
+			$rssdesc = sprintf(gettext("%s (RSS feed)"), $desc);
 		}
 		if ($atom) {
 			$atomurl=abs2rel($feedbase."atom".$feednum, dirname(htmlpage($params{destpage})));
-			$atomdesc = gettext("%s (Atom feed)", $desc);
+			$atomdesc = sprintf(gettext("%s (Atom feed)"), $desc);
 		}
 	}
 
diff --git a/debian/changelog b/debian/changelog
index ae2ff779e..4e16140cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ikiwiki (3.20110124) UNRELEASED; urgency=low
   * comments: Fix commenting, broken by security fix.
   * blogspam: Don't check modifications from admins for spam, and also
     allow the blogspam_pagespec to do other matches against who the user is.
+  * inline: Fix regression in feed titles. Closes: #610878
+    (Thanks, Paul Wise)
 
  -- Joey Hess <joeyh@debian.org>  Mon, 24 Jan 2011 16:56:05 -0400