diff options
| author | Joas Schilling <nickvergessen@owncloud.com> | 2016-01-04 16:17:54 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@owncloud.com> | 2016-01-04 16:24:52 +0100 |
| commit | 761000624d9f2a0f21e8472c4757f7428819f666 (patch) | |
| tree | 05b980bb792d65658b8b922e60891dabfd48f3a6 | |
| parent | 70ff90b1ec599a702a926f84baf18e744cc7529c (diff) | |
| download | nextcloud-server-761000624d9f2a0f21e8472c4757f7428819f666.tar.gz nextcloud-server-761000624d9f2a0f21e8472c4757f7428819f666.zip | |
Only enable apps that are not intentionally disabled
| -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'); } } } |