summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-11-19 09:11:14 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-11-19 09:11:14 +0100
commit1189528e1ff84542ae6c8fe32654a979b954e7cd (patch)
treebf2288ea1389f84849a967e2cf512244a8d4e8e1
parentc10be07c1b8538361dbfca1ae12bb279b72fe377 (diff)
downloadnextcloud-server-1189528e1ff84542ae6c8fe32654a979b954e7cd.tar.gz
nextcloud-server-1189528e1ff84542ae6c8fe32654a979b954e7cd.zip
Always installed apps includes the hardcoded ones from shipped.json
* fixes #20568
-rw-r--r--lib/private/app/appmanager.php6
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';
});