From 761000624d9f2a0f21e8472c4757f7428819f666 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 4 Jan 2016 16:17:54 +0100 Subject: [PATCH] Only enable apps that are not intentionally disabled --- lib/private/installer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/private/installer.php b/lib/private/installer.php index bbd976cda9..ed50503b3d 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'); } } }