Move checkMaintenance and checkUpgrade

This is needed to ensure that the routing and linkTo() function for CSP
are available.
remotes/origin/stable5
Lukas Reschke 12 years ago
parent d21946fdce
commit 7f49d35930
  1. 5
      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()) {

Loading…
Cancel
Save