mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Only cache enabled apps when logged in
This commit is contained in:
Joas Schilling 2014-06-23 18:02:57 +02: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
View File

@ -174,6 +174,7 @@ class OC_App {
} }
$appConfig = \OC::$server->getAppConfig(); $appConfig = \OC::$server->getAppConfig();
$appStatus = $appConfig->getValues(false, 'enabled'); $appStatus = $appConfig->getValues(false, 'enabled');
$user = \OC_User::getUser();
foreach ($appStatus as $app => $enabled) { foreach ($appStatus as $app => $enabled) {
if ($app === 'files') { if ($app === 'files') {
continue; continue;
@ -181,7 +182,6 @@ class OC_App {
if ($enabled === 'yes') { if ($enabled === 'yes') {
$apps[] = $app; $apps[] = $app;
} else if ($enabled !== 'no') { } else if ($enabled !== 'no') {
$user = \OC_User::getUser();
$groups = json_decode($enabled); $groups = json_decode($enabled);
if (is_array($groups)) { if (is_array($groups)) {
foreach ($groups as $group) { foreach ($groups as $group) {
@ -195,7 +195,12 @@ class OC_App {
} }
sort($apps); sort($apps);
array_unshift($apps, 'files'); 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; return $apps;
} }