diff options
| author | Joey Hess <joey@kitenet.net> | 2014-02-23 14:11:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-23 14:11:54 -0400 |
| commit | e0d1c264d9f21b02761f0bc86948ec0169927beb (patch) | |
| tree | 9d159896ace1a2257c9b789714c3f2ee65240175 | |
| parent | 5560afc08543ee0b2c51d075197f6b7d6e91672a (diff) | |
| download | ikiwiki-e0d1c264d9f21b02761f0bc86948ec0169927beb.tar ikiwiki-e0d1c264d9f21b02761f0bc86948ec0169927beb.tar.gz | |
Allow up to 8 levels of nested directives, rather than previous 3 in directive infinite loop guard.
| -rw-r--r-- | IkiWiki.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | doc/bugs/preprocessing_loop_control_too_tight.mdwn | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/IkiWiki.pm b/IkiWiki.pm index a254177f2..e5da04a3b 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -1508,7 +1508,7 @@ sub preprocess ($$$;$$) { push @params, $val, ''; } } - if ($preprocessing{$page}++ > 3) { + if ($preprocessing{$page}++ > 8) { # Avoid loops of preprocessed pages preprocessing # other pages that preprocess them, etc. return "[[!$command <span class=\"error\">". diff --git a/debian/changelog b/debian/changelog index a6ef93e11..76178674f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ ikiwiki (3.20140126) UNRELEASED; urgency=medium * po: Add html_lang_code and html_lang_dir template variables for the language code and direction of text. 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 diff --git a/doc/bugs/preprocessing_loop_control_too_tight.mdwn b/doc/bugs/preprocessing_loop_control_too_tight.mdwn index ba8534bd8..807d6b7ef 100644 --- a/doc/bugs/preprocessing_loop_control_too_tight.mdwn +++ b/doc/bugs/preprocessing_loop_control_too_tight.mdwn @@ -19,3 +19,5 @@ index 75c9579..ad0f8b0 100644 [[!tag patch]] > [[Seems reasonable|users/smcv/yesplease]] --smcv + +>> [[done]] --[[Joey]] |