Merge branch 'master' of git://github.com/melinath/philo

[philo.git] / templatetags / embed.py

diff --git a/templatetags/embed.py b/templatetags/embed.py
index e8c4cae..db5cea5 100644 (file)
--- a/templatetags/embed.py
+++ b/templatetags/embed.py
@@ -210,17 +210,13 @@ class ConstantEmbedNode(template.Node):
                try:
                        t = context.render_context[EMBED_CONTEXT_KEY].get_embed_template(self, context)
                except (KeyError, IndexError):
-                       if settings.TEMPLATE_DEBUG:
-                               raise
                        self.mark_rendered_for(context)
                        return settings.TEMPLATE_STRING_IF_INVALID
                
                context.push()
                context['embedded'] = instance
-               kwargs = {}
                for k, v in self.kwargs.items():
-                       kwargs[k] = v.resolve(context)
-               context.update(kwargs)
+                       context[k] = v.resolve(context)
                t_rendered = t.render(context)
                context.pop()
                self.mark_rendered_for(context)
@@ -267,7 +263,7 @@ class InstanceEmbedNode(EmbedNode):
        
        def get_content_type(self, context):
                instance = self.get_instance(context)
-               if instance is None:
+               if not instance:
                        return None
                return ContentType.objects.get_for_model(instance)