X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/270fd45c5d30c06f69e18488f08a7f6bdec95813..414ccfb1e298a722d2afa8b8540ca84dc1ccc6f2:/IkiWiki/Plugin/meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index b857f453e..220fff9dc 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -308,23 +308,25 @@ sub pagetemplate (@) {
 	}
 	if (exists $pagestate{$page}{meta}{title} && $template->query(name => "title")) {
 		eval q{use HTML::Entities};
-		$template->param(title => encode_numeric($pagestate{$page}{meta}{title}));
+		$template->param(title => HTML::Entities::encode_numeric($pagestate{$page}{meta}{title}));
 		$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}) {
 		eval q{use HTML::Entities};
-		$template->param($field => encode_numeric($pagestate{$page}{meta}{$field}))
+		$template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
 			if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);
 	}