sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9159 from owncloud/enabledapp-cache-loggedin 

Only cache enabled apps when logged in
remotes/origin/ldap_group_count
Joas Schilling 2014-06-23 18:02:57 +07:00
parent 536a190846 2547945779
commit 167ba14af7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/app.php
Unescape Escape View File

@ -174,6 +174,7 @@ class OC_App {
}
$appConfig = \OC::$server->getAppConfig();
$appStatus = $appConfig->getValues(false, 'enabled');
$user = \OC_User::getUser();
foreach ($appStatus as $app => $enabled) {
if ($app === 'files') {
continue;
@ -181,7 +182,6 @@ class OC_App {
if ($enabled === 'yes') {
$apps[] = $app;
} else if ($enabled !== 'no') {
$user = \OC_User::getUser();
$groups = json_decode($enabled);
if (is_array($groups)) {
foreach ($groups as $group) {
@ -195,7 +195,12 @@ class OC_App {
}
sort($apps);
array_unshift($apps, 'files');
self::$enabledAppsCache = $apps;
// Only cache the app list, when the user is logged in.
// Otherwise we cache the list with disabled apps, although
// the apps are enabled for the user after he logged in.
if ($user) {
self::$enabledAppsCache = $apps;
}
return $apps;
}