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

Merge remote branch 'upstream/filter-full' into prv/po

master
intrigeri 2010-07-11 11:04:59 +02:00
parent 4a1cb092ba 192ce7a238
commit d6f9d77431
9 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
IkiWiki/Plugin/color.pm
View File

@ -61,12 +61,11 @@ sub replace_preserved_style ($) {
sub preprocess (@) { sub preprocess (@) {
my %params = @_; my %params = @_;
# Preprocess the text to expand any preprocessor directives return preserve_style($params{foreground}, $params{background},
# embedded inside it. # Preprocess the text to expand any preprocessor directives
$params{text} = IkiWiki::preprocess($params{page}, $params{destpage}, # embedded inside it.
IkiWiki::filter($params{page}, $params{destpage}, $params{text})); IkiWiki::preprocess($params{page}, $params{destpage},
$params{text}));
return preserve_style($params{foreground}, $params{background}, $params{text});
} }
sub format (@) { sub format (@) {

2
IkiWiki/Plugin/comments.pm
View File

@ -143,8 +143,6 @@ sub preprocess {
} }
$content =~ s/\\"/"/g; $content =~ s/\\"/"/g;
$content = IkiWiki::filter($page, $params{destpage}, $content);
if ($config{comments_allowdirectives}) { if ($config{comments_allowdirectives}) {
$content = IkiWiki::preprocess($page, $params{destpage}, $content = IkiWiki::preprocess($page, $params{destpage},
$content); $content);

3
IkiWiki/Plugin/conditional.pm
View File

@ -59,8 +59,7 @@ sub preprocess_if (@) {
else { else {
$ret=""; $ret="";
} }
return IkiWiki::preprocess($params{page}, $params{destpage}, return IkiWiki::preprocess($params{page}, $params{destpage}, $ret);
IkiWiki::filter($params{page}, $params{destpage}, $ret));
} }
package IkiWiki::PageSpec; package IkiWiki::PageSpec;

8
IkiWiki/Plugin/cutpaste.pm
View File

@ -50,8 +50,8 @@ sub preprocess_copy (@) {
$savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}}; $savedtext{$params{page}} = {} if not exists $savedtext{$params{"page"}};
$savedtext{$params{page}}->{$params{id}} = $params{text}; $savedtext{$params{page}}->{$params{id}} = $params{text};
return IkiWiki::preprocess($params{page}, $params{destpage}, return IkiWiki::preprocess($params{page}, $params{destpage}, $params{text})
IkiWiki::filter($params{page}, $params{destpage}, $params{text})) if defined wantarray; if defined wantarray;
} }
sub preprocess_paste (@) { sub preprocess_paste (@) {
@ -70,8 +70,8 @@ sub preprocess_paste (@) {
error sprintf(gettext('no text was copied in this page with id %s'), $params{id}); error sprintf(gettext('no text was copied in this page with id %s'), $params{id});
} }
return IkiWiki::preprocess($params{page}, $params{destpage}, return IkiWiki::preprocess($params{page}, $params{destpage},
IkiWiki::filter($params{page}, $params{destpage}, $savedtext{$params{page}}->{$params{id}})); $savedtext{$params{page}}->{$params{id}});
} }
1; 1;

6
IkiWiki/Plugin/more.pm
View File

@ -33,9 +33,9 @@ sub preprocess (@) {
anchor => "more"); anchor => "more");
} }
else { else {
$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, return "<a name=\"more\"></a>\n\n".
IkiWiki::filter($params{page}, $params{destpage}, $params{text})); IkiWiki::preprocess($params{page}, $params{destpage},
return "<a name=\"more\"></a>\n\n".$params{text}; $params{text});
} }
} }

3
IkiWiki/Plugin/sidebar.pm
View File

@ -47,8 +47,7 @@ sub preprocess (@) {
$pagesidebar{$page}= $pagesidebar{$page}=
IkiWiki::htmlize($page, $page, $type, IkiWiki::htmlize($page, $page, $type,
IkiWiki::linkify($page, $page, IkiWiki::linkify($page, $page,
IkiWiki::preprocess($page, $page, IkiWiki::preprocess($page, $page, $params{content})));
IkiWiki::filter($page, $page, $params{content}))));
} }
return ""; return "";

6
IkiWiki/Plugin/template.pm
View File

@ -53,8 +53,7 @@ sub preprocess (@) {
foreach my $param (keys %params) { foreach my $param (keys %params) {
my $value=IkiWiki::preprocess($params{page}, $params{destpage}, my $value=IkiWiki::preprocess($params{page}, $params{destpage},
IkiWiki::filter($params{page}, $params{destpage}, $params{$param}, $scan);
$params{$param}), $scan);
if ($template->query(name => $param)) { if ($template->query(name => $param)) {
my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage}, my $htmlvalue=IkiWiki::htmlize($params{page}, $params{destpage},
pagetype($pagesources{$params{page}}), pagetype($pagesources{$params{page}}),
@ -69,8 +68,7 @@ sub preprocess (@) {
} }
return IkiWiki::preprocess($params{page}, $params{destpage}, return IkiWiki::preprocess($params{page}, $params{destpage},
IkiWiki::filter($params{page}, $params{destpage}, $template->output, $scan);
$template->output), $scan);
} }
1 1

3
IkiWiki/Plugin/toggle.pm
View File

@ -50,8 +50,7 @@ sub preprocess_toggleable (@) {
# Preprocess the text to expand any preprocessor directives # Preprocess the text to expand any preprocessor directives
# embedded inside it. # embedded inside it.
$params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text}=IkiWiki::preprocess($params{page}, $params{destpage}, $params{text});
IkiWiki::filter($params{page}, $params{destpage}, $params{text}));
my $id=genid($params{page}, $params{id}); my $id=genid($params{page}, $params{id});
my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open"; my $class=(lc($params{open}) ne "yes") ? "toggleable" : "toggleable-open";

4
doc/plugins/write.mdwn
View File

@ -198,8 +198,8 @@ value is ignored.
hook(type => "filter", id => "foo", call => \&filter); hook(type => "filter", id => "foo", call => \&filter);
Runs on the raw source of a page, before anything else touches it, and can Runs on the full raw source of a page, before anything else touches it, and
make arbitrary changes. The function is passed named parameters "page", can make arbitrary changes. The function is passed named parameters "page",
"destpage", and "content". It should return the filtered content. "destpage", and "content". It should return the filtered content.
### preprocess ### preprocess