urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

releasing version 3.20101201

master
Joey Hess 2010-12-01 20:34:30 -04:00
parent 853fcc2b56
commit 9c0f98de02
4 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IkiWiki/Plugin/meta.pm
View File

@ -40,10 +40,10 @@ sub needsbuild (@) {
return $needsbuild; return $needsbuild;
} }
sub scrub ($$) { sub scrub ($$$) {
if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) { if (IkiWiki::Plugin::htmlscrubber->can("sanitize")) {
return IkiWiki::Plugin::htmlscrubber::sanitize( return IkiWiki::Plugin::htmlscrubber::sanitize(
content => shift, destpage => shift); content => shift, page => shift, destpage => shift);
} }
else { else {
return shift; return shift;
@ -162,7 +162,7 @@ sub preprocess (@) {
# Metadata handling that happens only during preprocessing pass. # Metadata handling that happens only during preprocessing pass.
if ($key eq 'permalink') { if ($key eq 'permalink') {
if (safeurl($value)) { 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 $delay=int(exists $params{delay} ? $params{delay} : 0);
my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />"; my $redir="<meta http-equiv=\"refresh\" content=\"$delay; URL=$value\" />";
if (! $safe) { 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 { join(" ", map {
encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\"" encode_entities($_)."=\"".encode_entities(decode_entities($params{$_}))."\""
} keys %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.'="'. push @{$metaheaders{$page}}, scrub('<meta '.$key.'="'.
encode_entities($value). encode_entities($value).
join(' ', map { "$_=\"$params{$_}\"" } keys %params). join(' ', map { "$_=\"$params{$_}\"" } keys %params).
' />', $destpage); ' />', $page, $destpage);
} }
else { else {
push @{$metaheaders{$page}}, scrub('<meta name="'. push @{$metaheaders{$page}}, scrub('<meta name="'.
encode_entities($key).'" content="'. encode_entities($key).'" content="'.
encode_entities($value).'" />', $destpage); encode_entities($value).'" />', $page, $destpage);
} }
return ""; return "";

8
debian/changelog vendored
View File

@ -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 ikiwiki (3.20101129) unstable; urgency=low
* websetup: Fix encoding problem when restoring old setup file. * websetup: Fix encoding problem when restoring old setup file.

2
ikiwiki.spec
View File

@ -1,5 +1,5 @@
Name: ikiwiki Name: ikiwiki
Version: 3.20101129 Version: 3.20101201
Release: 1%{?dist} Release: 1%{?dist}
Summary: A wiki compiler Summary: A wiki compiler

2
po/ikiwiki.pot
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"