Skip to content
Browse files

Merge branch 'develop' of github.com:divio/django-cms into feature/ve…

…nv-tests
  • Loading branch information...
2 parents 7c9f4d0 + f56ebbb commit 889684181b5f967bbc93561a58a15c73dab215b6 @ojii ojii committed Jun 8, 2012
Showing with 4 additions and 3 deletions.
  1. +3 −2 cms/utils/plugins.py
  2. +1 −1 setup.py
View
5 cms/utils/plugins.py
@@ -11,6 +11,7 @@
from django.template.loader_tags import (ConstantIncludeNode, ExtendsNode,
BlockNode)
import warnings
+from sekizai.helpers import is_variable_extend_node
def get_page_from_plugin_or_404(cms_plugin):
return get_object_or_404(Page, placeholders=cms_plugin.placeholder)
@@ -20,7 +21,7 @@ def _extend_blocks(extend_node, blocks):
Extends the dictionary `blocks` with *new* blocks in the parent node (recursive)
"""
# we don't support variable extensions
- if extend_node.parent_name_expr:
+ if is_variable_extend_node(extend_node):
return
parent = extend_node.get_parent(None)
# Search for new blocks
@@ -54,7 +55,7 @@ def _extend_nodelist(extend_node):
ExtendsNode
"""
# we don't support variable extensions
- if extend_node.parent_name_expr:
+ if is_variable_extend_node(extend_node):
return []
blocks = extend_node.blocks
_extend_blocks(extend_node, blocks)
View
2 setup.py
@@ -33,7 +33,7 @@
'south>=0.7.2',
'html5lib',
'django-mptt==0.5.1',
- 'django-sekizai>=0.4.2',
+ 'django-sekizai>=0.6.1',
],
tests_require=[
'django-reversion==1.4',

0 comments on commit 8896841

Please sign in to comment.
Something went wrong with that request. Please try again.