Merge remote-tracking branch 'remotes/matiss/patch-1' into develop

2015-04-11 11:08:44 +10:00 · 2015-04-11 11:08:44 +10:00 · ebcf57e8e3
parent a273fb2acf 26d92d282f
commit ebcf57e8e3
1 changed files with 1 additions and 1 deletions
--- a/modules/system/classes/ErrorHandler.php
+++ b/modules/system/classes/ErrorHandler.php
@ -49,7 +49,7 @@ class ErrorHandler extends ErrorHandlerBase

        // Route to the CMS error page.
        $controller = new Controller($theme);
-        return $controller->run('/error');
+        return $controller->run('/error')->getContent();
    }

    /**