Merge remote branch 'smcv/ready/tag-test'

[git.ikiwiki.info.git] / IkiWiki / Plugin / meta.pm

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 47007afe286bd780eba392fde2fa2b20039ec73e..ad6d1a8e338895685be79486c5b4dac95f9c21b9 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -40,10 +40,10 @@ sub needsbuild (@) {
        return $needsbuild;
 }
 
-sub scrub ($$) {
+sub scrub ($$$) {
        if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
                return IkiWiki::Plugin::htmlscrubber::sanitize(
-                       content => shift, destpage => shift);
+                       content => shift, page => shift, destpage => shift);
        }
        else {
                return shift;
@@ -162,7 +162,7 @@ sub preprocess (@) {
        # Metadata handling that happens only during preprocessing pass.
        if ($key eq 'permalink') {
                if (safeurl($value)) {
-                       push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $destpage);
+                       push @{$metaheaders{$page}}, scrub('<link rel="bookmark" href="'.encode_entities($value).'" />', $page, $destpage);
                }
        }
        elsif ($key eq 'stylesheet') {
@@ -240,7 +240,7 @@ sub preprocess (@) {
                my $delay=int(exists $params{delay} ? $params{delay} : 0);
                my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
                if (! $safe) {
-                       $redir=scrub($redir, $destpage);
+                       $redir=scrub($redir, $page, $destpage);
                }
                push @{$metaheaders{$page}}, $redir;
        }
@@ -250,7 +250,7 @@ sub preprocess (@) {
                                join(" ", map {
                                        encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
                                } keys %params).
-                               " />\n", $destpage);
+                               " />\n", $page, $destpage);
                }
        }
        elsif ($key eq 'robots') {
@@ -266,12 +266,12 @@ sub preprocess (@) {
                push @{$metaheaders{$page}}, scrub('<meta '.$key.'="'.
                        encode_entities($value).
                        join(' ', map { "$_=\"$params{$_}\"" } keys %params).
-                       ' />', $destpage);
+                       ' />', $page, $destpage);
        }
        else {
                push @{$metaheaders{$page}}, scrub('<meta name="'.
                        encode_entities($key).'" content="'.
-                       encode_entities($value).'" />', $destpage);
+                       encode_entities($value).'" />', $page, $destpage);
        }
 
        return "";
@@ -298,6 +298,11 @@ sub pagetemplate (@) {
                        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);
+       }
+
        foreach my $field (qw{description}) {
                $template->param($field => HTML::Entities::encode_numeric($pagestate{$page}{meta}{$field}))
                        if exists $pagestate{$page}{meta}{$field} && $template->query(name => $field);