From 9c0f98de02f550081d8bb8bf18cf12db92bec6cd Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Dec 2010 20:34:30 -0400 Subject: releasing version 3.20101201 --- IkiWiki/Plugin/meta.pm | 14 +++++++------- debian/changelog | 8 ++++++++ ikiwiki.spec | 2 +- 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('', $destpage); + push @{$metaheaders{$page}}, scrub('', $page, $destpage); } } elsif ($key eq 'stylesheet') { @@ -240,7 +240,7 @@ sub preprocess (@) { my $delay=int(exists $params{delay} ? $params{delay} : 0); my $redir=""; 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('', $destpage); + ' />', $page, $destpage); } else { push @{$metaheaders{$page}}, scrub('', $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 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 \n" "Language-Team: LANGUAGE \n" -- cgit v1.2.3 From dae4a144e7219ce596f9d96206176a3d1d1ad4a5 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 1 Dec 2010 20:35:26 -0400 Subject: add news item for ikiwiki 3.20101201 --- doc/news/version_3.20100915.mdwn | 28 ---------------------------- doc/news/version_3.20101201.mdwn | 5 +++++ 2 files changed, 5 insertions(+), 28 deletions(-) delete mode 100644 doc/news/version_3.20100915.mdwn create mode 100644 doc/news/version_3.20101201.mdwn diff --git a/doc/news/version_3.20100915.mdwn b/doc/news/version_3.20100915.mdwn deleted file mode 100644 index 90c5cc37a..000000000 --- a/doc/news/version_3.20100915.mdwn +++ /dev/null @@ -1,28 +0,0 @@ -ikiwiki 3.20100915 released with [[!toggle text="these changes"]] -[[!toggleable text=""" - * needsbuild hook interface changed; the hooks should now return - the modified array of things that need built. (Backwards compatibility - code keeps plugins using the old interface working.) - * Remove PATH overriding code in ikiwiki script that was present to make - perl taint checking happy, but taint checking is disabled. - * teximg: Use Unicode UTF-8 encoding by default. Closes: #[596067](http://bugs.debian.org/596067) - Thanks, Paul Menzel. - * po: Make the po\_master\_language use a langpair like "en|English", - so it can be configured via the web. - * po: Allow enabling via web setup. - * po: Auto-upgrade old format settings to new formats when writing - setup file. - * Pass array of names of files that have been deleted to needsbuild hook - as second parameter, to allow for plugins that needs access to this - information earlier than the delete hook. - * actiontabs: Improve tab padding. - * blueview: Fix display of links to translated pages in the page header. - * Set isPermaLink="no" for guids in rss feeds. - * blogspam: Fix crash when content contained utf-8. - * external: Disable RPC::XML's "smart" encoding, which sent ints - for strings that contained only a number, fixing a longstanding crash - of the rst plugin. - * git: When updating from remote, use git pull --prune, to avoid possible - errors from conflicting obsolete remote branches. - * cutpaste: Fix bug that occured in some cases involving inlines when - text was pasted on a page before being cut."""]] \ No newline at end of file diff --git a/doc/news/version_3.20101201.mdwn b/doc/news/version_3.20101201.mdwn new file mode 100644 index 000000000..410640c75 --- /dev/null +++ b/doc/news/version_3.20101201.mdwn @@ -0,0 +1,5 @@ +ikiwiki 3.20101201 released with [[!toggle text="these changes"]] +[[!toggleable text=""" + * 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."""]] \ No newline at end of file -- cgit v1.2.3