mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #7888 from nextcloud/backport/7879/dont-disable-shipped-apps-on-errors-12 

[stable12] Keep all shipped apps enabled because they should be okay
This commit is contained in:
Roeland Jago Douma 2018-01-16 20:19:32 +01:00 committed by GitHub
parent 7a7e756b0e c7485fa1ad
commit 60fa75d2ec
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

@ -209,8 +209,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);
}
}