diff options
| author | Joey Hess <joey@kitenet.net> | 2010-12-01 20:25:05 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-12-01 20:25:05 -0400 |
| commit | aa65300c2f6a22d4372020b4b5b1a04b5842531a (patch) | |
| tree | 120de2aedf6474d12b70bc5809928e5f343be1a0 /IkiWiki | |
| parent | 2884e3c6c7bfbcf49d3128f1e8b5b6dc99fc8955 (diff) | |
| download | ikiwiki-aa65300c2f6a22d4372020b4b5b1a04b5842531a.tar ikiwiki-aa65300c2f6a22d4372020b4b5b1a04b5842531a.tar.gz | |
meta: Fix calling of htmlscrubber to pass the page parameter. The change of the htmlscrubber to look at page rather than destpage caused htmlscrubber_skip to not work for meta directives.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/meta.pm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 47007afe2..abc8f1b1a 100644 --- 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 ""; |