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

Merge pull request #21447 from owncloud/leave-disabled-apps-off 

Only enable apps that are not intentionally disabled
This commit is contained in:
Thomas Müller 2016-01-08 18:17:15 +01:00
parent 3de81be692 761000624d
commit 6ab5ad0593
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/private/installer.php
View File

@ -506,9 +506,10 @@ class OC_Installer{
if(!OC_Installer::isInstalled($filename)) { if(!OC_Installer::isInstalled($filename)) {
$info=OC_App::getAppInfo($filename); $info=OC_App::getAppInfo($filename);
$enabled = isset($info['default_enable']); $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_Installer::installShippedApp($filename);
\OC::$server->getAppConfig()->setValue($filename, 'enabled', 'yes'); \OC::$server->getConfig()->setAppValue($filename, 'enabled', 'yes');
} }
} }
} }