summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBart Visscher <bartv@thisnet.nl>2013-06-28 17:23:40 +0200
committerBart Visscher <bartv@thisnet.nl>2013-06-28 17:23:40 +0200
commit9a50a8f0cc680e9bb611bc92469c4b156c3a989b (patch)
treea938da7acaf62c0b98b610111e68b10a1253f784
parent6127fee5aa012e58c124b00f159afd3d3d95d8ce (diff)
downloadnextcloud-server-9a50a8f0cc680e9bb611bc92469c4b156c3a989b.tar.gz
nextcloud-server-9a50a8f0cc680e9bb611bc92469c4b156c3a989b.zip
Don't load the apps when we need to upgrade
The loading can call functions that require new tables, like oc_jobs
-rw-r--r--lib/base.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php
index fd4870974fe..c95eac0d2f7 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -472,7 +472,7 @@ class OC {
// This includes plugins for users and filesystems as well
global $RUNTIME_NOAPPS;
global $RUNTIME_APPTYPES;
- if (!$RUNTIME_NOAPPS) {
+ if (!$RUNTIME_NOAPPS && !self::checkUpgrade(false)) {
if ($RUNTIME_APPTYPES) {
OC_App::loadApps($RUNTIME_APPTYPES);
} else {