diff options
author | Joey Hess <joey@kitenet.net> | 2011-07-29 12:37:43 +0200 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-07-29 12:37:43 +0200 |
commit | 65a7bc4e06efdbc5eac4b5b8fe76eb0344fcab3f (patch) | |
tree | a38aa767de118d32cac74256772975324739efc1 | |
parent | 81d2edad0e7f4ced4f02f23e80dc6a10966ac317 (diff) | |
download | ikiwiki-65a7bc4e06efdbc5eac4b5b8fe76eb0344fcab3f.tar ikiwiki-65a7bc4e06efdbc5eac4b5b8fe76eb0344fcab3f.tar.gz |
Fix escaping of html entities in permalinks.
-rw-r--r-- | IkiWiki/Plugin/meta.pm | 8 | ||||
-rw-r--r-- | debian/changelog | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index e9736584c..220fff9dc 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -312,14 +312,16 @@ sub pagetemplate (@) { $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 => 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}) { diff --git a/debian/changelog b/debian/changelog index 0cb094a8d..20c5d20c7 100644 --- 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. + * Fix escaping of html entities in permalinks. -- Joey Hess <joeyh@debian.org> Tue, 19 Jul 2011 11:22:52 -0400 |