diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2013-01-28 05:43:47 -0800 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2013-01-28 05:43:47 -0800 |
| commit | 99ec26578a78467356a1ae4b154ce9138dbc6eb9 (patch) | |
| tree | 9a9fa7eb14440d75eeddadf70fc95a46f770714e /lib | |
| parent | 857b15db3739fe8fbbad4df0f10e9b48ba1f90c2 (diff) | |
| parent | 1d44a99ebb5f00b3b9550f4c281db7519cec3c75 (diff) | |
| download | nextcloud-server-99ec26578a78467356a1ae4b154ce9138dbc6eb9.tar.gz nextcloud-server-99ec26578a78467356a1ae4b154ce9138dbc6eb9.zip | |
Merge pull request #1313 from owncloud/updater-CSP
Make update page with CSP compatible
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/base.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php index aff3e1d5a11..f9818d3514e 100644 --- a/lib/base.php +++ b/lib/base.php @@ -259,6 +259,7 @@ class OC if ($showTemplate && !OC_Config::getValue('maintenance', false)) { OC_Config::setValue('maintenance', true); OC_Log::write('core', 'starting upgrade from ' . $installedVersion . ' to ' . $currentVersion, OC_Log::DEBUG); + OC_Util::addscript('update'); $tmpl = new OC_Template('', 'update', 'guest'); $tmpl->assign('version', OC_Util::getVersionString()); $tmpl->printPage(); @@ -429,8 +430,6 @@ class OC self::checkSSL(); self::initSession(); self::initTemplateEngine(); - self::checkMaintenanceMode(); - self::checkUpgrade(); $errors = OC_Util::checkServer(); if (count($errors) > 0) { @@ -570,10 +569,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()) { |