Merge pull request #27970 from owncloud/enableapp-throwexception

Throw exception after enabling app, for additional info
owncloud · May 22, 2017 · c9e7148 · c9e7148
2 parents cb6f4a2 + aaf5ecc
commit c9e7148
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
@@ -49,6 +49,7 @@
 use OC\App\Platform;
 use OC\Installer;
 use OC\Repair;
+use OC\HintException;
 
 /**
  * This class manages the apps. It allows them to register and integrate in the
@@ -214,8 +215,10 @@ private static function requireAppFile($app) {
 			\OC::$server->getLogger()->logException($ex);
 			$blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
 			if (!in_array($app, $blacklist)) {
+				\OC::$server->getLogger()->warning('Could not load app "' . $app . '", it will be disabled', array('app' => 'core'));
 				self::disable($app);
 			}
+			throw $ex;
 		}
 	}