Fix escaping of html entities in permalinks.

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index e9736584c5836fb9c4a077819ca6b939fd248aa9..220fff9dccaa547824ccb0bc7a19ddbe583f516d 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -312,14 +312,16 @@ sub pagetemplate (@) {
                $template->param(title_overridden => 1);
        }
 
                $template->param(title_overridden => 1);
        }
 

-       foreach my $field (qw{author authorurl permalink}) {
+       foreach my $field (qw{author authorurl}) {

                $template->param($field => $pagestate{$page}{meta}{$field})
                        if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
        }
 
        foreach my $field (qw{permalink}) {
                $template->param($field => $pagestate{$page}{meta}{$field})
                        if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
        }
 
        foreach my $field (qw{permalink}) {

-               $template->param($field => IkiWiki::urlabs($pagestate{$page}{meta}{$field}, $config{url}))
-                       if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
+               if (exists $pagestate{$page}{meta}{$field} && $template->query(name => $field)) {
+                       eval q{use HTML::Entities};
+                       $template->param($field => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{$field}, $config{url})));
+               }

        }
 
        foreach my $field (qw{description}) {
        }
 
        foreach my $field (qw{description}) {

diff --git a/debian/changelog b/debian/changelog
index 0cb094a8d160afff8808f3dc3d98fd45775261fe..20c5d20c700e325c29ac8668d3373dc52e74d6c1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20110716) UNRELEASED; urgency=low
   * po: Add `LANG_CODE` and `LANG_NAME` template variables. (intrigeri)
   * Fix typo in Danish translation of shortcuts page that caused expoentional
     regexp blowup.
   * po: Add `LANG_CODE` and `LANG_NAME` template variables. (intrigeri)
   * Fix typo in Danish translation of shortcuts page that caused expoentional
     regexp blowup.

+  * Fix escaping of html entities in permalinks.

 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400
 
 
  -- Joey Hess <joeyh@debian.org>  Tue, 19 Jul 2011 11:22:52 -0400