summaryrefslogtreecommitdiffstats
path: root/lib/private/installer.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/installer.php')
-rw-r--r--lib/private/installer.php5
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');
}
}
}