wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7879 from nextcloud/bugfix/7865/dont-disable-shipped-apps-on-errors

Browse source 
Keep all shipped apps enabled because they should be okay
This commit is contained in:
Morris Jobke 2018-01-16 13:36:45 +01:00 committed by GitHub
commit 9a99fc0623
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/legacy/app.php
View file

@ -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);
}
}