From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Thu, 15 Jul 2010 03:05:36 +0000 (-0400)
Subject: Fixed the node_url templatetag's generation of URLs.
X-Git-Tag: philo-0.9~48
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/a78ab01230384bac5d762e91a41cc62e87f69f02?ds=sidebyside

Fixed the node_url templatetag's generation of URLs.
---

diff --git a/templatetags/nodes.py b/templatetags/nodes.py
index 3be8194..0cb2289 100644
--- a/templatetags/nodes.py
+++ b/templatetags/nodes.py
@@ -28,10 +28,13 @@ class NodeURLNode(template.Node):
 				node = context['node']
 			current_site = Site.objects.get_current()
 			if node.has_ancestor(current_site.root_node):
-				url = node.get_path(root=current_site.root_node)
+				url = '/' + node.get_path(root=current_site.root_node)
 				if self.with_obj:
 					with_obj = self.with_obj.resolve(context)
-					url += node.view.get_subpath(with_obj)
+					subpath = node.view.get_subpath(with_obj)
+					if subpath[0] is '/':
+						subpath = subpath[1:]
+					url += subpath
 			else:
 				return settings.TEMPLATE_STRING_IF_INVALID