fix issue with personal settings when global settings are forced

2020-10-13 11:09:14 +02:00
parent dfe6ad7bd4
commit a57017e80b
1 changed files with 2 additions and 1 deletions
@@ -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;
        }