mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move checkMaintenance and checkUpgrade 

This is needed to ensure that the routing and linkTo() function for CSP
are available.
This commit is contained in:
Lukas Reschke 2013-01-25 19:15:02 +01:00
parent d21946fdce
commit 7f49d35930
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/base.php
View File

@ -422,8 +422,6 @@ class OC
self::checkSSL(); self::checkSSL();
self::initSession(); self::initSession();
self::initTemplateEngine(); self::initTemplateEngine();
self::checkMaintenanceMode();
self::checkUpgrade();
$errors = OC_Util::checkServer(); $errors = OC_Util::checkServer();
if (count($errors) > 0) { if (count($errors) > 0) {
@ -563,10 +561,13 @@ class OC
return; return;
} }
// Check if ownCloud is installed or in maintenance (update) mode
if (!OC_Config::getValue('installed', false)) { if (!OC_Config::getValue('installed', false)) {
require_once 'core/setup.php'; require_once 'core/setup.php';
exit(); exit();
} }
self::checkMaintenanceMode();
self::checkUpgrade();
// Handle redirect URL for logged in users // Handle redirect URL for logged in users
if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) { if (isset($_REQUEST['redirect_url']) && OC_User::isLoggedIn()) {