Minor corrections to node_url and embed templatetags to avoid raising unnecessary...

diff --git a/templatetags/embed.py b/templatetags/embed.py
index e8c4cae..176bbc4 100644 (file)
--- a/templatetags/embed.py
+++ b/templatetags/embed.py
@@ -267,7 +267,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)
 

diff --git a/templatetags/nodes.py b/templatetags/nodes.py
index 9721ec4..73492d4 100644 (file)
--- a/templatetags/nodes.py
+++ b/templatetags/nodes.py
@@ -51,7 +51,9 @@ class NodeURLNode(template.Node):
                                subpath = reverse(view_name, urlconf=node.view, args=args, kwargs=kwargs)
                        except NoReverseMatch:
                                if self.as_var is None:
-                                       raise
+                                       if settings.TEMPLATE_DEBUG:
+                                               raise
+                                       return settings.TEMPLATE_STRING_IF_INVALID
                        else:
                                if subpath[0] == '/':
                                        subpath = subpath[1:]