aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2018-07-28 21:22:51 +0200
committerMario <mario@mariovavti.com>2018-07-28 21:22:51 +0200
commitcbd8c07265590d68bedcaa105b860cfed637e49e (patch)
tree06874ee9cfffc0b63bc95772c7d95a07c37e828a
parent3a6d3cb396746096943c00efade7831317d21bf0 (diff)
parent05b3237bae016e888d15b954292fe3a37a5c4899 (diff)
downloadvolse-hubzilla-cbd8c07265590d68bedcaa105b860cfed637e49e.tar.gz
volse-hubzilla-cbd8c07265590d68bedcaa105b860cfed637e49e.tar.bz2
volse-hubzilla-cbd8c07265590d68bedcaa105b860cfed637e49e.zip
Merge branch 'patch-9' into 'dev'
Respect navbar translations See merge request hubzilla/core!1243
-rw-r--r--include/nav.php6
1 files 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 {