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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d89e14197f4edfd1e1db5a137e1b6c8584e97eb0..28507720403f4da7940b2a55d2a72ad357d58664 100644 (file)
--- 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 ae2ff779e93408754a13824eaedbfa8826fc6f35..4e16140cb4eac8d2a0e4c6db376aa6b97588020c 100644 (file)
--- 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