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

Allow up to 8 levels of nested directives, rather than previous 3 in directive infinite loop guard.

master
Joey Hess 2014-02-23 14:11:54 -04:00
parent 5560afc085
commit e0d1c264d9
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IkiWiki.pm
View File

@ -1508,7 +1508,7 @@ sub preprocess ($$$;$$) {
push @params, $val, ''; push @params, $val, '';
} }
} }
if ($preprocessing{$page}++ > 3) { if ($preprocessing{$page}++ > 8) {
# Avoid loops of preprocessed pages preprocessing # Avoid loops of preprocessed pages preprocessing
# other pages that preprocess them, etc. # other pages that preprocess them, etc.
return "[[!$command <span class=\"error\">". return "[[!$command <span class=\"error\">".

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium
* po: Add html_lang_code and html_lang_dir template variables * po: Add html_lang_code and html_lang_dir template variables
for the language code and direction of text. for the language code and direction of text.
Thanks, Mesar Hameed Thanks, Mesar Hameed
* Allow up to 8 levels of nested directives, rather than previous 3
in directive infinite loop guard.
-- Joey Hess <joeyh@debian.org> Sat, 01 Feb 2014 16:53:35 -0400 -- Joey Hess <joeyh@debian.org> Sat, 01 Feb 2014 16:53:35 -0400

2
doc/bugs/preprocessing_loop_control_too_tight.mdwn
View File

@ -19,3 +19,5 @@ index 75c9579..ad0f8b0 100644
[[!tag patch]] [[!tag patch]]
> [[Seems reasonable|users/smcv/yesplease]] --smcv > [[Seems reasonable|users/smcv/yesplease]] --smcv
>> [[done]] --[[Joey]]