diff options
author | Morris Jobke <morris.jobke@gmail.com> | 2013-10-28 03:17:52 -0700 |
---|---|---|
committer | Morris Jobke <morris.jobke@gmail.com> | 2013-10-28 03:17:52 -0700 |
commit | c61d328ab9696a620b623fb2dfd1622eb0363dc4 (patch) | |
tree | 65344364c93e3d362edec374b188da8bcb915da3 /lib/base.php | |
parent | 8df8211225a4252649b652da603ead5d2b9a9a84 (diff) | |
parent | 9a50a8f0cc680e9bb611bc92469c4b156c3a989b (diff) | |
download | nextcloud-server-c61d328ab9696a620b623fb2dfd1622eb0363dc4.tar.gz nextcloud-server-c61d328ab9696a620b623fb2dfd1622eb0363dc4.zip |
Merge pull request #3889 from owncloud/apps_preload
Don't load the apps when we need to upgrade
Diffstat (limited to 'lib/base.php')
-rw-r--r-- | lib/base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/base.php b/lib/base.php index 240dd1c12b6..d29a95ecec9 100644 --- a/lib/base.php +++ b/lib/base.php @@ -507,7 +507,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 { |