Don't use routes when displaying error page

diff --git a/lib/template.php b/lib/template.php
index 3df5a24f946cb3db3c95a65671e2ee64606c2229..0f9efe66496d803c94919ae71c675c7bea0f4b0b 100644 (file)
--- a/lib/template.php
+++ b/lib/template.php
@@ -530,8 +530,10 @@ class OC_Template{
                * @param string $hint An option hint message
                */
        public static function printErrorPage( $error_msg, $hint = '' ) {
+               $content = new OC_Template( '', 'error', 'error' );
                $errors = array(array('error' => $error_msg, 'hint' => $hint));
-               OC_Template::printGuestPage("", "error", array("errors" => $errors));
+               $content->assign( 'errors', $errors, false );
+               $content->printPage();
                die();
        }
 }

diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 25d4033d9eef1e7351e65c9abbbfae27c4013729..afa875b0a6d90ec38ff915dd58f339ed531db016 100644 (file)
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -31,7 +31,7 @@ class OC_TemplateLayout extends OC_Template {
                        }
                        $user_displayname = OC_User::getDisplayName();
                        $this->assign( 'user_displayname', $user_displayname );
-               } else if ($renderas == 'guest') {
+               } else if ($renderas == 'guest' || $renderas == 'error') {
                        parent::__construct('core', 'layout.guest');
                } else {
                        parent::__construct('core', 'layout.base');
@@ -39,7 +39,7 @@ class OC_TemplateLayout extends OC_Template {
                // Add the js files
                $jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
                $this->assign('jsfiles', array(), false);
-               if (OC_Config::getValue('installed', false)) {
+               if (OC_Config::getValue('installed', false) && $renderas!='error') {
                        $this->append( 'jsfiles', OC_Helper::linkToRoute('js_config'));
                }
                if (!empty(OC_Util::$core_scripts)) {