diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2018-01-16 21:52:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 21:52:36 +0100 |
| commit | 7ea3623cd9256b4d6055bd00199ba3c85d586399 (patch) | |
| tree | 56553f6749c11b2794f7015c27b7ccfc28db0a14 /lib | |
| parent | 4b2e98953b00f9bef9f6c70b36679ae387ce8442 (diff) | |
| parent | d639dfacb7c68fa9bad7f3289cbc182e8feb6e3d (diff) | |
| download | nextcloud-server-7ea3623cd9256b4d6055bd00199ba3c85d586399.tar.gz nextcloud-server-7ea3623cd9256b4d6055bd00199ba3c85d586399.zip | |
Merge pull request #7887 from nextcloud/backport/7879/dont-disable-shipped-apps-on-errors
[stable13] Keep all shipped apps enabled because they should be okay
Diffstat (limited to 'lib')
| -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 1b9fc28873e..53841a13acf 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); } } |