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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a254177f2d7a136a42c2c407111c7ef8576d6ab7..e5da04a3bb86d8aa47d96cac3df679623ad707ee 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -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
                                # other pages that preprocess them, etc.
                                return "[[!$command <span class=\"error\">".
                                # 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 a6ef93e11a097bec74991931d5991061022045a8..76178674f199c40fc72961c70473c06c1d34fe0a 100644 (file)
--- 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
   * 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
 
 
  -- 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 ba8534bd8623b853e122fd78beef11a916eec9b7..807d6b7ef4e50e13a75a4d144e99afd48823e78e 100644 (file)
--- 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
 [[!tag patch]]
 
 > [[Seems reasonable|users/smcv/yesplease]] --smcv

+
+>> [[done]] --[[Joey]]