From 4a325421f5e59f4961c01d7d8639c1e8d7ea044a Mon Sep 17 00:00:00 2001 From: Matt Westcott Date: Fri, 22 Sep 2017 11:44:11 +0100 Subject: [PATCH] Fix admin 404 page (#3705) for Django 1.8 --- wagtail/wagtailadmin/urls/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wagtail/wagtailadmin/urls/__init__.py b/wagtail/wagtailadmin/urls/__init__.py index 709dd7f472..240df1e9f7 100644 --- a/wagtail/wagtailadmin/urls/__init__.py +++ b/wagtail/wagtailadmin/urls/__init__.py @@ -1,5 +1,6 @@ import functools +import django from django.conf.urls import url, include from django.views.decorators.cache import cache_control from django.views.generic import TemplateView @@ -94,7 +95,10 @@ def display_custom_404(view_func): try: return view_func(request, *args, **kwargs) except Http404: - return page_not_found(request, '', template_name='wagtailadmin/404.html') + if django.VERSION < (1, 9): + return page_not_found(request, template_name='wagtailadmin/404.html') + else: + return page_not_found(request, '', template_name='wagtailadmin/404.html') return wrapper