releasing version 3.20101201

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 47007afe286bd780eba392fde2fa2b20039ec73e..abc8f1b1aa1089f60ba62e93dbcca0062696f4f6 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -40,10 +40,10 @@ sub needsbuild (@) {
        return $needsbuild;
 }
 
        return $needsbuild;
 }
 

-sub scrub ($$) {
+sub scrub ($$$) {

        if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
                return IkiWiki::Plugin::htmlscrubber::sanitize(
        if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
                return IkiWiki::Plugin::htmlscrubber::sanitize(

-                       content => shift, destpage => shift);
+                       content => shift, page => shift, destpage => shift);

        }
        else {
                return 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)) {
        # 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') {
                }
        }
        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) {
                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;
        }
                }
                push @{$metaheaders{$page}}, $redir;
        }


@@ -250,7 +250,7 @@ sub preprocess (@) {
                                join(" ", map {
                                        encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
                                } keys %params).
                                join(" ", map {
                                        encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
                                } keys %params).

-                               " />\n", $destpage);
+                               " />\n", $page, $destpage);

                }
        }
        elsif ($key eq 'robots') {
                }
        }
        elsif ($key eq 'robots') {


@@ -266,12 +266,12 @@ sub preprocess (@) {
                push @{$metaheaders{$page}}, scrub('<meta '.$key.'="'.
                        encode_entities($value).
                        join(' ', map { "$_=\"$params{$_}\"" } keys %params).
                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="'.
        }
        else {
                push @{$metaheaders{$page}}, scrub('<meta name="'.
                        encode_entities($key).'" content="'.

-                       encode_entities($value).'" />', $destpage);
+                       encode_entities($value).'" />', $page, $destpage);

        }
 
        return "";
        }
 
        return "";

diff --git a/debian/changelog b/debian/changelog
index fd271dab103e7164c120bc9ab8acad1818133abe..cecf61d5eab517e20c27382604b3a5e7d1b907c0 100644 (file)
--- 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.
 ikiwiki (3.20101129) unstable; urgency=low
 
   * websetup: Fix encoding problem when restoring old setup file.

diff --git a/ikiwiki.spec b/ikiwiki.spec
index b0826d64e969fdcc612633c4f00fc6e4754326ba..09cc4a0f4be256e5e184ddb42d6588d38f70c2b9 100644 (file)
--- a/ikiwiki.spec
+++ b/ikiwiki.spec
@@ -1,5 +1,5 @@
 Name:           ikiwiki
 Name:           ikiwiki

-Version: 3.20101129
+Version: 3.20101201

 Release:        1%{?dist}
 Summary:        A wiki compiler
 
 Release:        1%{?dist}
 Summary:        A wiki compiler
 

diff --git a/po/ikiwiki.pot b/po/ikiwiki.pot
index 492222b86f3ea3d1803fb72660d6e7a2d58d70dd..6eb13103ea9dd7da52846939ba262d6bebe4c586 100644 (file)
--- 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"
 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"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"