From 7f6bf7170a77372620132bc6e0a323015c1889a4 Mon Sep 17 00:00:00 2001 From: Mario Date: Sat, 28 Jul 2018 19:22:51 +0000 Subject: [PATCH] Merge branch 'patch-9' into 'dev' Respect navbar translations See merge request hubzilla/core!1243 (cherry picked from commit cbd8c07265590d68bedcaa105b860cfed637e49e) 05b3237b Update nav.php --- include/nav.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/nav.php b/include/nav.php index 41358c93e..05d2d199f 100644 --- a/include/nav.php +++ b/include/nav.php @@ -105,12 +105,12 @@ function nav($template = 'default') { $nav['logout'] = ['logout',t('Logout'), "", t('End this session'),'logout_nav_btn']; // user menu - $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((\App::$nav_sel['name'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn']; + $nav['usermenu'][] = ['profile/' . $channel['channel_address'], t('View Profile'), ((\App::$nav_sel['raw_name'] == 'Profile') ? 'active' : ''), t('Your profile page'),'profile_nav_btn']; if(feature_enabled(local_channel(),'multi_profiles')) - $nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((\App::$nav_sel['name'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn']; + $nav['usermenu'][] = ['profiles', t('Edit Profiles'), ((\App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : '') , t('Manage/Edit profiles'),'profiles_nav_btn']; else - $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((\App::$nav_sel['name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn']; + $nav['usermenu'][] = ['profiles/' . $prof[0]['id'], t('Edit Profile'), ((\App::$nav_sel['raw_name'] == 'Profiles') ? 'active' : ''), t('Edit your profile'),'profiles_nav_btn']; } else {