diff --git a/src/pretix/multidomain/maindomain_urlconf.py b/src/pretix/multidomain/maindomain_urlconf.py index b03dbfce6b..34fd8cc0e4 100644 --- a/src/pretix/multidomain/maindomain_urlconf.py +++ b/src/pretix/multidomain/maindomain_urlconf.py @@ -66,7 +66,7 @@ for app in apps.get_app_configs(): single_plugin_patterns.append(re_path(r'^(?P[^/]+)/(?P[^/]+)/', include(patterns))) if hasattr(urlmod, 'organizer_patterns'): - patterns = urlmod.organizer_patterns + patterns = plugin_event_urls(urlmod.organizer_patterns, plugin=app.name) single_plugin_patterns.append(re_path(r'^(?P[^/]+)/', include(patterns))) raw_plugin_patterns.append( diff --git a/src/pretix/multidomain/organizer_domain_urlconf.py b/src/pretix/multidomain/organizer_domain_urlconf.py index e7098096a1..603e91e9c6 100644 --- a/src/pretix/multidomain/organizer_domain_urlconf.py +++ b/src/pretix/multidomain/organizer_domain_urlconf.py @@ -49,7 +49,7 @@ for app in apps.get_app_configs(): re_path(r'^(?P[^/]+)/', include((patterns, app.label))) ) if hasattr(urlmod, 'organizer_patterns'): - patterns = urlmod.organizer_patterns + patterns = plugin_event_urls(urlmod.organizer_patterns, plugin=app.name) raw_plugin_patterns.append( re_path(r'', include((patterns, app.label))) ) diff --git a/src/pretix/presale/utils.py b/src/pretix/presale/utils.py index 9a94a53ae6..87703f9159 100644 --- a/src/pretix/presale/utils.py +++ b/src/pretix/presale/utils.py @@ -389,8 +389,9 @@ def _event_view(function=None, require_live=True, require_plugin=None): else: with scope(organizer=getattr(request, 'organizer', None)): response = func(request=request, *args, **kwargs) - for receiver, r in process_response.send(request.event, request=request, response=response): - response = r + if getattr(request, 'event', None): + for receiver, r in process_response.send(request.event, request=request, response=response): + response = r if isinstance(response, TemplateResponse): response = response.render()