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

* Generalised preprocesser loop protection code.

master
joey 2006-08-25 19:06:37 +00:00
parent f4d99ac1ca
commit 6fc3b624f2
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IkiWiki/Plugin/inline.pm
View File

@ -22,7 +22,6 @@ sub import { #{{{
package IkiWiki;
my %toping;
my @processing_inline;
sub yesno ($) { #{{{
my $val=shift;
@ -32,10 +31,6 @@ sub yesno ($) { #{{{
sub preprocess_inline (@) { #{{{
my %params=@_;
# Avoid nested inlines, to avoid loops etc.
return "" if grep { $_ eq $params{page} } @processing_inline;
push @processing_inline, $params{page};
if (! exists $params{pages}) {
return "";
}
@ -133,7 +128,6 @@ sub preprocess_inline (@) { #{{{
$toping{$params{page}}=1 unless $config{rebuild};
}
pop @processing_inline;
return $ret;
} #}}}

11
IkiWiki/Render.pm
View File

@ -84,6 +84,7 @@ sub parentlinks ($) { #{{{
return @ret;
} #}}}
my @preprocessing;
sub preprocess ($$$) { #{{{
my $page=shift; # the page the data comes from
my $destpage=shift; # the page the data will appear in (different for inline)
@ -96,6 +97,11 @@ sub preprocess ($$$) { #{{{
if (length $escape) {
return "[[$command $params]]";
}
elsif (grep { $_ eq $page } @preprocessing) {
# Avoid loops of preprocessed pages preprocessing
# other pages that preprocess them, etc.
return "[[$command would cause preprocessing loop]]";
}
elsif (exists $hooks{preprocess}{$command}) {
# Note: preserve order of params, some plugins may
# consider it significant.
@ -123,11 +129,14 @@ sub preprocess ($$$) { #{{{
push @params, $val, '';
}
}
return $hooks{preprocess}{$command}{call}->(
push @preprocessing, $page;
my $ret=$hooks{preprocess}{$command}{call}->(
@params,
page => $page,
destpage => $destpage,
);
pop @preprocessing;
return $ret;
}
else {
return "[[$command not processed]]";

3
debian/changelog vendored
View File

@ -30,8 +30,9 @@ ikiwiki (1.22) UNRELEASED; urgency=low
* Use DESTDIR and not PREFIX to specify installation prefix for packaging.
* Support running "perl Makefile.PL PREFIX=foo" to build ikiwiki to run
from a different directory.
* Generalised preprocesser loop protection code.
-- Joey Hess <joeyh@debian.org> Thu, 24 Aug 2006 21:28:45 -0400
-- Joey Hess <joeyh@debian.org> Fri, 25 Aug 2006 14:48:36 -0400
ikiwiki (1.21) unstable; urgency=low