diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-01-25 19:15:02 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-01-25 19:15:02 +0100 |
| commit | 7f49d359306cbcd3303fcdd7feb0e6931ecffd8d (patch) | |
| tree | b37535c9813cafe11e3fb49ab81d76e157d53078 | |
| parent | d21946fdce1e27351601bdbff805859685a4bb16 (diff) | |
| download | nextcloud-server-7f49d359306cbcd3303fcdd7feb0e6931ecffd8d.tar.gz nextcloud-server-7f49d359306cbcd3303fcdd7feb0e6931ecffd8d.zip | |
Move checkMaintenance and checkUpgrade
This is needed to ensure that the routing and linkTo() function for CSP
are available.
| -rw-r--r-- | lib/base.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index f1a60a17739..81a5a615de4 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()) { |