aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-07-29 06:59:10 +0200
committerMario Vavti <mario@mariovavti.com>2018-07-29 06:59:10 +0200
commit45d262d6c0d976e573abe593d1994dfef590bb61 (patch)
tree9970d3f1c7e2c25a928c6b008123e531766b433b /include
parent5dbd11c6edf61f2962a57fa8d4743ba55dfaa5ba (diff)
parentd85c849668c2d0b7e1eb010005e69c02b7b762c4 (diff)
downloadvolse-hubzilla-45d262d6c0d976e573abe593d1994dfef590bb61.tar.gz
volse-hubzilla-45d262d6c0d976e573abe593d1994dfef590bb61.tar.bz2
volse-hubzilla-45d262d6c0d976e573abe593d1994dfef590bb61.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include')
-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 {