From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 9 Jan 2015 20:52:16 +0000 (+0100)
Subject: Add some more sanity checks for maintenance mode
X-Git-Tag: v8.0.0beta1~44^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5f31207e841e567d25fc99f7c34274ca5dd9e630;p=nextcloud-server.git

Add some more sanity checks for maintenance mode
---

diff --git a/lib/base.php b/lib/base.php
index f4021b543b2..dbfe0eb2f27 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -737,7 +737,9 @@ class OC {
 		}
 
 		// Load minimum set of apps
-		if (!self::checkUpgrade(false)) {
+		if (!self::checkUpgrade(false)
+			&& !$systemConfig->getValue('maintenance', false)
+			&& !\OCP\Util::needUpgrade()) {
 			// For logged-in users: Load everything
 			if(OC_User::isLoggedIn()) {
 				OC_App::loadApps();