diff --git a/src/pretix/control/context.py b/src/pretix/control/context.py index 2edbe53bf8..f9547e5a5b 100644 --- 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 index e898a00001..c1f61fbe9a 100644 --- 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 {}