From 3d21cae940ed0b2d96e61457298b54ce83a63848 Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Thu, 21 Sep 2017 13:25:12 +0100
Subject: [PATCH] Allow overriding branding_logo on the 404 page

---
 docs/advanced_topics/customisation/admin_templates.rst | 2 ++
 wagtail/wagtailadmin/templates/wagtailadmin/404.html   | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/advanced_topics/customisation/admin_templates.rst b/docs/advanced_topics/customisation/admin_templates.rst
index b0a638780b..96dc71e24c 100644
--- a/docs/advanced_topics/customisation/admin_templates.rst
+++ b/docs/advanced_topics/customisation/admin_templates.rst
@@ -43,6 +43,8 @@ To replace the default logo, create a template file ``dashboard/templates/wagtai
         <img src="{% static 'images/custom-logo.svg' %}" alt="Custom Project" width="80" />
     {% endblock %}
 
+The logo also appears on the admin 404 error page; to replace it there too, create a template file ``dashboard/templates/wagtailadmin/404.html`` that overrides the ``branding_logo`` block.
+
 ``branding_favicon``
 --------------------
 
diff --git a/wagtail/wagtailadmin/templates/wagtailadmin/404.html b/wagtail/wagtailadmin/templates/wagtailadmin/404.html
index e94fbf98d7..34d03c7e23 100644
--- a/wagtail/wagtailadmin/templates/wagtailadmin/404.html
+++ b/wagtail/wagtailadmin/templates/wagtailadmin/404.html
@@ -13,7 +13,9 @@
 {% block furniture %}
     <div class="page404__bg">
         <div class="page404__wrapper">
-            {% include "wagtailadmin/shared/animated_logo.html" %}
+            {% block branding_logo %}
+                {% include "wagtailadmin/shared/animated_logo.html" %}
+            {% endblock %}
 
             <div class="page404__text-container">
                 <h1 class="page404__header">