Merge pull request #21085 from owncloud/occ-shall-not-fail-hard-in-maintenance-mode-stable8.1

Don't load commands of apps when in maintenance mode 

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/private/console/application.php b/lib/private/console/application.php
index 7c709927219..a6cbe207a3b 100644
--- a/lib/private/console/application.php
+++ b/lib/private/console/application.php
@@ -52,7 +52,11 @@ class Application {
 		$application = $this->application;
 		require_once \OC::$SERVERROOT . '/core/register_command.php';
 		if ($this->config->getSystemValue('installed', false)) {
-			if (!\OCP\Util::needUpgrade()) {
+			if (\OCP\Util::needUpgrade()) {
+				$output->writeln("ownCloud or one of the apps require upgrade - only a limited number of commands are available");
+			} elseif ($this->config->getSystemValue('maintenance', false)) {
+				$output->writeln("ownCloud is in maintenance mode - no app have been loaded");
+			} else {
 				OC_App::loadApps();
 				foreach (\OC::$server->getAppManager()->getInstalledApps() as $app) {
 					$file = OC_App::getAppPath($app) . '/appinfo/register_command.php';
@@ -60,8 +64,6 @@ class Application {
 						require $file;
 					}
 				}
-			} else {
-				$output->writeln("ownCloud or one of the apps require upgrade - only a limited number of commands are available");
 			}
 		} else {
 			$output->writeln("ownCloud is not installed - only a limited number of commands are available");