summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Karlitschek <frank@owncloud.org>2013-03-03 14:38:50 -0800
committerFrank Karlitschek <frank@owncloud.org>2013-03-03 14:38:50 -0800
commitef01e0cdc5459373f253886c5adcd9e09fa003fa (patch)
treec74ccc12c22837bace91f7e6ffc60fe7e6061d2b
parentd8d14637f331b55489acfa0b7574ae9af2b40611 (diff)
parentd800f35bf460c3bb94aef90ea2479e408eb0bae8 (diff)
downloadnextcloud-server-ef01e0cdc5459373f253886c5adcd9e09fa003fa.tar.gz
nextcloud-server-ef01e0cdc5459373f253886c5adcd9e09fa003fa.zip
Merge pull request #2057 from owncloud/upgrade-fixes
Upgrade fixes
-rw-r--r--lib/base.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/base.php b/lib/base.php
index f70496912df..bffae36261e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -539,7 +539,7 @@ class OC {
'setting locale to en_US.UTF-8/en_US.UTF8 failed. Support is probably not installed on your system',
OC_Log::ERROR);
}
- if (OC_Config::getValue('installed', false)) {
+ if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) {
if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
OC_Util::addScript('backgroundjobs');
}
@@ -596,7 +596,9 @@ class OC {
if (!self::$CLI) {
try {
- OC_App::loadApps();
+ if (!OC_Config::getValue('maintenance', false)) {
+ OC_App::loadApps();
+ }
OC::getRouter()->match(OC_Request::getRawPathInfo());
return;
} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {