X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/ab7d1efef433b723e30a62773f3cf0bbbb35a407..e095f691f243784f8c8d0a9773270b9dbead18e9:/templatetags/embed.py

diff --git a/templatetags/embed.py b/templatetags/embed.py
index e8c4cae..db5cea5 100644
--- 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)