Merge branch 'kgodey'

[philo.git] / templatetags / containers.py

diff --git a/templatetags/containers.py b/templatetags/containers.py
index 2e40e53..7ed0bdc 100644 (file)
--- a/templatetags/containers.py
+++ b/templatetags/containers.py
@@ -31,11 +31,14 @@ class ContainerNode(template.Node):
                if 'page' in context:
                        container_content = self.get_container_content(context)
                
-               if self.nodelist_main is None:
-                       self.nodelist_main
-                       if container_content and self.as_var:
+               if not self.nodelist_main:
+                       if self.as_var:
                                context[self.as_var] = container_content
                                return ''
+                       
+                       if not container_content:
+                               return ''
+                       
                        return container_content
                
                if container_content: