Merge branch 'kgodey'

[philo.git] / templatetags / containers.py

diff --git a/templatetags/containers.py b/templatetags/containers.py
index ca5e1e9..7ed0bdc 100644 (file)
--- a/templatetags/containers.py
+++ b/templatetags/containers.py
@@ -29,13 +29,16 @@ class ContainerNode(template.Node):
        def render(self, context):
                content = settings.TEMPLATE_STRING_IF_INVALID
                if 'page' in context:
-                       container_content = self.get_container_content(context['page'])
+                       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:
@@ -56,7 +59,8 @@ class ContainerNode(template.Node):
                
                return ''
        
-       def get_container_content(self, page):
+       def get_container_content(self, context):
+               page = context['page']
                if self.references:
                        try:
                                contentreference = page.contentreferences.get(name__exact=self.name, content_type=self.references)
@@ -71,7 +75,7 @@ class ContainerNode(template.Node):
                                                content = mark_safe(template.Template(contentlet.content, name=contentlet.name).render(context))
                                        except template.TemplateSyntaxError, error:
                                                if settings.DEBUG:
-                                                       content = ('[Error parsing contentlet \'%s\': %s]' % self.name, error)
+                                                       content = ('[Error parsing contentlet \'%s\': %s]' % (self.name, error))
                                else:
                                        content = contentlet.content
                        except ObjectDoesNotExist: