X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/bd4e85c2780dc58b34a16b4f2137723e68ba5a07..067104fc328a25677564058f5443267c94db3432:/middleware.py

diff --git a/middleware.py b/middleware.py
index ad660ec..c0b1e9e 100644
--- a/middleware.py
+++ b/middleware.py
@@ -15,12 +15,24 @@ class LazyNode(object):
 			except Site.DoesNotExist:
 				current_site = None
 			
+			path = request._cached_node_path
+			trailing_slash = False
+			if path[-1] == '/':
+				trailing_slash = True
+			
 			try:
-				node, subpath = Node.objects.get_with_path(request._cached_node_path, root=getattr(current_site, 'root_node', None), absolute_result=False)
+				node, subpath = Node.objects.get_with_path(path, root=getattr(current_site, 'root_node', None), absolute_result=False)
 			except Node.DoesNotExist:
 				node = None
 			
 			if node:
+				if subpath is None:
+					subpath = ""
+				subpath = "/" + subpath
+				
+				if trailing_slash and subpath[-1] != "/":
+					subpath += "/"
+				
 				node.subpath = subpath
 			
 			request._found_node = node