forked from deblan/side_menu
fix issue with personal settings when global settings are forced
This commit is contained in:
parent
dfe6ad7bd4
commit
a57017e80b
|
@ -98,6 +98,7 @@ class NavController extends Controller
|
|||
$currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
|
||||
$externalSitesInTopMenu = $this->config->getAppValueBool('external-sites-in-top-menu', '0');
|
||||
$user = OC::$server[IUserSession::class]->getUser();
|
||||
$isForced = $this->config->getAppValueBool('force', '0');
|
||||
$appsCategories = [];
|
||||
$categoriesAppsCount = [];
|
||||
$items = [];
|
||||
|
@ -119,7 +120,7 @@ class NavController extends Controller
|
|||
$topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
|
||||
$userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
|
||||
|
||||
if (!empty($userTopMenuApps)) {
|
||||
if (!$isForced && !empty($userTopMenuApps)) {
|
||||
$topMenuApps = $userTopMenuApps;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue