diff options
| author | Joey Hess <joey@kitenet.net> | 2010-12-01 20:34:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-12-01 20:34:30 -0400 |
| commit | 9c0f98de02f550081d8bb8bf18cf12db92bec6cd (patch) | |
| tree | 2050dbff06b86a1d20ff6a5bbbd10a44dfcb3a88 | |
| parent | 853fcc2b56d72462901ee0f72621d02cb97dc2a3 (diff) | |
releasing version 3.20101201
| -rw-r--r-- | IkiWiki/Plugin/meta.pm | 14 | ||||
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | ikiwiki.spec | 2 | ||||
| -rw-r--r-- | po/ikiwiki.pot | 2 |
4 files changed, 17 insertions, 9 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 ""; diff --git a/debian/changelog b/debian/changelog index fd271dab1..cecf61d5e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +ikiwiki (3.20101201) unstable; urgency=low + + * 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. + + -- Joey Hess <joeyh@debian.org> Wed, 01 Dec 2010 20:28:01 -0400 + ikiwiki (3.20101129) unstable; urgency=low * websetup: Fix encoding problem when restoring old setup file. diff --git a/ikiwiki.spec b/ikiwiki.spec index b0826d64e..09cc4a0f4 100644 --- a/ikiwiki.spec +++ b/ikiwiki.spec @@ -1,5 +1,5 @@ Name: ikiwiki -Version: 3.20101129 +Version: 3.20101201 Release: 1%{?dist} Summary: A wiki compiler diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot index 492222b86..6eb13103e 100644 --- a/po/ikiwiki.pot +++ b/po/ikiwiki.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-11-29 14:01-0400\n" +"POT-Creation-Date: 2010-12-01 20:29-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" |