Handle Resolver404 exception in context processors

pretix · Feb 17, 2016 · 72e6680 · 72e6680
1 parent ba678de
commit 72e6680
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/pretix/control/context.py b/src/pretix/control/context.py
@@ -1,5 +1,5 @@
 from django.conf import settings
-from django.core.urlresolvers import get_script_prefix, resolve
+from django.core.urlresolvers import Resolver404, get_script_prefix, resolve
 
 from .signals import html_head, nav_event
 
@@ -8,7 +8,11 @@ def contextprocessor(request):
     """
     Adds data to all template contexts
     """
-    url = resolve(request.path_info)
+    try:
+        url = resolve(request.path_info)
+    except Resolver404:
+        return {}
+
     if not request.path.startswith(get_script_prefix() + 'control'):
         return {}
     ctx = {

diff --git a/src/pretix/presale/context.py b/src/pretix/presale/context.py
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import resolve
+from django.core.urlresolvers import Resolver404, resolve
 
 from .signals import html_head
 
@@ -7,7 +7,10 @@ def contextprocessor(request):
     """
     Adds data to all template contexts
     """
-    url = resolve(request.path_info)
+    try:
+        url = resolve(request.path_info)
+    except Resolver404:
+        return {}
     if url.namespace != 'presale':
         return {}