X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/db91ce955e7408382263b8f4ec82915f77d8efb4..77f783071cd3c6246a90dc6aa869b4efe7610379:/templatetags/nodes.py

diff --git a/templatetags/nodes.py b/templatetags/nodes.py
index 8a98630..5ae507d 100644
--- a/templatetags/nodes.py
+++ b/templatetags/nodes.py
@@ -25,7 +25,7 @@ class NodeURLNode(template.Node):
 		if self.node:
 			node = self.node.resolve(context)
 		else:
-			node = context['node']
+			node = context.get('node', None)
 		
 		if not node:
 			return settings.TEMPLATE_STRING_IF_INVALID
@@ -51,12 +51,11 @@ 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:]
-				
-				url = node.get_absolute_url() + subpath
+				url = node.construct_url(subpath)
 		
 		if self.as_var:
 			context[self.as_var] = url
@@ -68,7 +67,7 @@ class NodeURLNode(template.Node):
 @register.tag(name='node_url')
 def do_node_url(parser, token):
 	"""
-	{% node_url [for <node>] [as <var] %}
+	{% node_url [for <node>] [as <var>] %}
 	{% node_url with <obj> [for <node>] [as <var>] %}
 	{% node_url <view_name> [<arg1> [<arg2> ...] ] [for <node>] [as <var>] %}
 	{% node_url <view_name> [<key1>=<value1> [<key2>=<value2> ...] ] [for <node>] [as <var>]%}