summaryrefslogtreecommitdiffstats
path: root/lib/private/app.php
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-10-16 16:38:43 +0200
committerThomas Müller <thomas.mueller@tmit.eu>2015-10-26 09:53:04 +0100
commit5a5bcccd0d612bbb23214777d33a6439b75ffb53 (patch)
treecd75ed606dffbd4a9fa473c54f3b81f51aa6bd35 /lib/private/app.php
parent6fc59f85b69af3ab6a8b979b7b6240cc4920efc7 (diff)
downloadnextcloud-server-5a5bcccd0d612bbb23214777d33a6439b75ffb53.tar.gz
nextcloud-server-5a5bcccd0d612bbb23214777d33a6439b75ffb53.zip
Don't show apps which are always enabled in the app manager
Diffstat (limited to 'lib/private/app.php')
-rw-r--r--lib/private/app.php6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/private/app.php b/lib/private/app.php
index a95019ac022..d7e62dfd852 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -768,12 +768,9 @@ class OC_App {
if ($file[0] != '.' and is_dir($apps_dir['path'] . '/' . $file) and is_file($apps_dir['path'] . '/' . $file . '/appinfo/info.xml')) {
$apps[] = $file;
-
}
-
}
}
-
}
return $apps;
@@ -793,7 +790,8 @@ class OC_App {
//TODO which apps do we want to blacklist and how do we integrate
// blacklisting with the multi apps folder feature?
- $blacklist = array('files'); //we don't want to show configuration for these
+ //we don't want to show configuration for these
+ $blacklist = \OC::$server->getAppManager()->getAlwaysEnabledApps();
$appList = array();
$l = \OC::$server->getL10N('core');