Merge pull request #20602 from owncloud/fix-installed-apps

Always installed apps includes the hardcoded ones from shipped.json

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
index 1f993d8538f..f826c8ba0c7 100644
--- a/lib/private/app/appmanager.php
+++ b/lib/private/app/appmanager.php
@@ -77,6 +77,12 @@ class AppManager implements IAppManager {
 	private function getInstalledAppsValues() {
 		if (!$this->installedAppsCache) {
 			$values = $this->appConfig->getValues(false, 'enabled');
+
+			$alwaysEnabledApps = $this->getAlwaysEnabledApps();
+			foreach($alwaysEnabledApps as $appId) {
+				$values[$appId] = 'yes';
+			}
+
 			$this->installedAppsCache = array_filter($values, function ($value) {
 				return $value !== 'no';
 			});