This fixes the placeholder scanning/template parsing when using the c…

…ached template loader. Without this fix the test suite will freeze/infinite loop while parsing the templates.
django-cms · Aug 19, 2011 · 88f5784 · 88f5784
1 parent 03e7d01
commit 88f5784
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/cms/utils/plugins.py b/cms/utils/plugins.py
@@ -30,7 +30,9 @@ def _extend_blocks(extend_node, blocks):
         else:
             # set this node as the super node (for {{ block.super }})
             block = blocks[node.name]
-            while hasattr(block.super, 'nodelist'):
+            seen_supers = []
+            while hasattr(block.super, 'nodelist') and block.super not in seen_supers:
+                seen_supers.append(block.super)
                 block = block.super
             block.super = node
     # search for further ExtendsNodes

diff --git a/tests/project/settings.py b/tests/project/settings.py
@@ -43,10 +43,18 @@
 
 SECRET_KEY = '*xq7m@)*f2awoj!spa0(jibsrz9%c0d=e(g)v*!17y(vx0ue_3'
 
+#TEMPLATE_LOADERS = (
+#    'django.template.loaders.filesystem.Loader',
+#    'django.template.loaders.app_directories.Loader',
+#    'django.template.loaders.eggs.Loader',
+#)
+
 TEMPLATE_LOADERS = (
-    'django.template.loaders.filesystem.Loader',
-    'django.template.loaders.app_directories.Loader',
-    'django.template.loaders.eggs.Loader',
+    ('django.template.loaders.cached.Loader', (
+        'django.template.loaders.filesystem.Loader',
+        'django.template.loaders.app_directories.Loader',
+        'django.template.loaders.eggs.Loader',
+    )),
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = [