diff options
author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-08 18:17:15 +0100 |
---|---|---|
committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-08 18:17:15 +0100 |
commit | 6ab5ad059311477adacba9a547ab0ffbd130f075 (patch) | |
tree | 85f18f1775d614101be59dee5c37facfe7fc6aa3 /lib/private | |
parent | 3de81be692db69452c9c652605133ac71ab12dec (diff) | |
parent | 761000624d9f2a0f21e8472c4757f7428819f666 (diff) | |
download | nextcloud-server-6ab5ad059311477adacba9a547ab0ffbd130f075.tar.gz nextcloud-server-6ab5ad059311477adacba9a547ab0ffbd130f075.zip |
Merge pull request #21447 from owncloud/leave-disabled-apps-off
Only enable apps that are not intentionally disabled
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/installer.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/installer.php b/lib/private/installer.php index bbd976cda91..ed50503b3dc 100644 --- a/lib/private/installer.php +++ b/lib/private/installer.php @@ -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'); } } } |