Fix escaping of html entities in tag names.

Example case was a tag with & in its name, which resulted in a malformed
rss feed.

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index ca74fef9021f660a3420903a1715bf4cf0867808..096c92616aa76e2414775b6ed67f8ef9fecd24bf 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -199,8 +199,10 @@ sub pagetemplate (@) {
        if ($template->query(name => "categories")) {
                # It's an rss/atom template. Add any categories.
                if (defined $tags && %$tags) {
-                       $template->param(categories => [map { category => tagname($_) },
-                               sort keys %$tags]);
+                       eval q{use HTML::Entities};
+                       $template->param(categories =>
+                               [map { category => HTML::Entities::encode_entities(tagname($_)) },
+                                       sort keys %$tags]);
                }
        }
 }

diff --git a/debian/changelog b/debian/changelog
index 20c5d20c700e325c29ac8668d3373dc52e74d6c1..66389f3fb01d62bf35afbeabee262c398b5da0cd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * Fix typo in Danish translation of shortcuts page that caused expoentional
     regexp blowup.
   * Fix escaping of html entities in permalinks.
+  * Fix escaping of html entities in tag names.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400