From 7f49d359306cbcd3303fcdd7feb0e6931ecffd8d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 25 Jan 2013 19:15:02 +0100
Subject: [PATCH] Move checkMaintenance and checkUpgrade
This is needed to ensure that the routing and linkTo() function for CSP
are available.
---
lib/base.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/base.php b/lib/base.php
index f1a60a1773..81a5a615de 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -422,8 +422,6 @@ class OC
self::checkSSL();
self::initSession();
self::initTemplateEngine();
- self::checkMaintenanceMode();
- self::checkUpgrade();
$errors = OC_Util::checkServer();
if (count($errors) > 0) {
@@ -563,10 +561,13 @@ class OC
return;
}
+ // Check if ownCloud is installed or in maintenance (update) mode
if (!OC_Config::getValue('installed', false)) {
require_once 'core/setup.php';
exit();
}
+ self::checkMaintenanceMode();
+ self::checkUpgrade();
// Handle redirect URL for logged in users
if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {
--
GitLab