diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-16 13:36:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 13:36:45 +0100 |
| commit | 9a99fc062375f23dca7d210365e6f54984dd144e (patch) | |
| tree | 2d10c651aa15ba9a53e27f98cdc2612d138cbddc | |
| parent | 4ae04c3d6331a28e146e9cb2b961c7731fb1217d (diff) | |
| parent | c95890f9b0481680d992a0296173cb4185ad5593 (diff) | |
| download | nextcloud-server-9a99fc062375f23dca7d210365e6f54984dd144e.tar.gz nextcloud-server-9a99fc062375f23dca7d210365e6f54984dd144e.zip | |
Merge pull request #7879 from nextcloud/bugfix/7865/dont-disable-shipped-apps-on-errors
Keep all shipped apps enabled because they should be okay
| -rw-r--r-- | lib/private/legacy/app.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index 8114895416b..a20a88ac08f 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -236,8 +236,8 @@ class OC_App { require_once $app . '/appinfo/app.php'; } catch (Error $ex) { \OC::$server->getLogger()->logException($ex); - $blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps(); - if (!in_array($app, $blacklist)) { + if (!\OC::$server->getAppManager()->isShipped($app)) { + // Only disable apps which are not shipped self::disable($app); } } |