From 2350e30853cc2c1337697bb38c113f7319eea0f1 Mon Sep 17 00:00:00 2001
From: Jens Herlevsen <jensherlevsen@gmail.com>
Date: Sun, 24 Jan 2016 19:04:22 +0100
Subject: [PATCH] Make default 404 page use 404 status code

---
 modules/cms/classes/Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/cms/classes/Controller.php b/modules/cms/classes/Controller.php
index b942f98f6..056549cff 100644
--- a/modules/cms/classes/Controller.php
+++ b/modules/cms/classes/Controller.php
@@ -190,7 +190,7 @@ class Controller
         /*
          * If the page was not found, render the 404 page - either provided by the theme or the built-in one.
          */
-        if (!$page) {
+        if (!$page || $url === '404') {
             $this->setStatusCode(404);
 
             // Log the 404 request