diff --git a/src/Controller/Component/Navigation/Users.php b/src/Controller/Component/Navigation/Users.php index 860545d..21fb76b 100644 --- a/src/Controller/Component/Navigation/Users.php +++ b/src/Controller/Component/Navigation/Users.php @@ -25,20 +25,17 @@ class UsersNavigation extends BaseNavigation $request = $this->request; $passedData = $this->request->getParam('pass'); $currentUser = $this->currentUser; - $ownUser = (!empty($passedData[0]) && $passedData[0] === $currentUser['id']); - if ($ownUser) { - $this->bcf->addLink('Users', 'view', 'UserSettings', 'index', function ($config) use ($bcf, $request, $passedData, $currentUser) { - if (!empty($passedData[0])) { - $user_id = $passedData[0]; - $linkData = [ - 'label' => __('Account settings', h($user_id)), - 'url' => sprintf('/users/settings/%s', h($user_id)) - ]; - return $linkData; - } - return []; - }); - } + $this->bcf->addLink('Users', 'view', 'UserSettings', 'index', function ($config) use ($bcf, $request, $passedData, $currentUser) { + if (!empty($passedData[0])) { + $user_id = $passedData[0]; + $linkData = [ + 'label' => __('Account settings', h($user_id)), + 'url' => sprintf('/users/settings/%s', h($user_id)) + ]; + return $linkData; + } + return []; + }); $this->bcf->addLink('Users', 'view', 'UserSettings', 'index', function ($config) use ($bcf, $request, $passedData) { if (!empty($passedData[0])) { $user_id = $passedData[0]; diff --git a/templates/Users/settings.php b/templates/Users/settings.php index 4681def..cd3a920 100644 --- a/templates/Users/settings.php +++ b/templates/Users/settings.php @@ -52,7 +52,7 @@ if(!empty($editingAnotherUser)) { Bootstrap->alert([ - 'text' => __('Currently editing the account setting of another user.'), + 'text' => __('Currently editing the account settings of another user.'), 'variant' => 'warning', 'dismissible' => false ])