X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/8aad28a2a098d4f6c0401070e28081c55d8d1e6e..785b59352880027f54ea0e81335d179eccee75f1:/middleware.py

diff --git a/middleware.py b/middleware.py
index fa30ef6..5bcd569 100644
--- a/middleware.py
+++ b/middleware.py
@@ -15,15 +15,27 @@ 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
+			else:
+				if subpath and not node.handles_subpath(subpath):
+					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
@@ -37,7 +49,10 @@ class RequestNodeMiddleware(object):
 		request.__class__.node = LazyNode()
 	
 	def process_view(self, request, view_func, view_args, view_kwargs):
-		request._cached_node_path = view_kwargs.get('path', '/')
+		try:
+			request._cached_node_path = view_kwargs['path']
+		except KeyError:
+			pass
 	
 	def process_exception(self, request, exception):
 		if settings.DEBUG or not hasattr(request, 'node') or not request.node: