Only enable apps that are not intentionally disabled

This commit is contained in:
Joas Schilling 2016-01-04 16:17:54 +01:00
parent 70ff90b1ec
commit 761000624d
1 changed files with 3 additions and 2 deletions

View File

@ -506,9 +506,10 @@ class OC_Installer{
if(!OC_Installer::isInstalled($filename)) {
$info=OC_App::getAppInfo($filename);
$enabled = isset($info['default_enable']);
if( $enabled ) {
if (($enabled || in_array($filename, \OC::$server->getAppManager()->getAlwaysEnabledApps()))
&& \OC::$server->getConfig()->getAppValue($filename, 'enabled') !== 'no') {
OC_Installer::installShippedApp($filename);
\OC::$server->getAppConfig()->setValue($filename, 'enabled', 'yes');
\OC::$server->getConfig()->setAppValue($filename, 'enabled', 'yes');
}
}
}