From 18b7a2bf2139245897fa4d6633d2e115ba72d927 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 27 Feb 2013 11:17:14 +0100 Subject: [PATCH 1/2] add css and scripts before session init --- lib/base.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index f9bb1bb11b..8654f9906f 100644 --- a/lib/base.php +++ b/lib/base.php @@ -459,8 +459,8 @@ class OC { self::checkConfig(); self::checkInstalled(); self::checkSSL(); - self::initSession(); self::initTemplateEngine(); + self::initSession(); $errors = OC_Util::checkServer(); if (count($errors) > 0) { From a1afc2e34f4652d791b78e7f541712301cd48c9d Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 27 Feb 2013 11:36:05 +0100 Subject: [PATCH 2/2] only add style.css to initsession --- lib/base.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/base.php b/lib/base.php index 8654f9906f..b46a97af64 100644 --- a/lib/base.php +++ b/lib/base.php @@ -326,6 +326,7 @@ class OC { OC_Log::ERROR); header('HTTP/1.1 500 Internal Server Error'); + OC_Util::addStyle("styles"); $error = 'Session could not be initialized. Please contact your '; $error .= 'system administrator'; @@ -459,8 +460,8 @@ class OC { self::checkConfig(); self::checkInstalled(); self::checkSSL(); - self::initTemplateEngine(); self::initSession(); + self::initTemplateEngine(); $errors = OC_Util::checkServer(); if (count($errors) > 0) {