aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-07-29 18:00:56 -0700
committerzotlabs <mike@macgirvin.com>2018-07-29 18:00:56 -0700
commit32614e4074758d6112993d71169664a3c29e90b2 (patch)
tree6de47408110062e1c6a3f18dfaf0dc183c459c9a /include
parent9dc5a3bfc9152f04b9e39d61e90310d660029108 (diff)
parente4a1286aae411023210628d3be306420f7844d22 (diff)
downloadvolse-hubzilla-32614e4074758d6112993d71169664a3c29e90b2.tar.gz
volse-hubzilla-32614e4074758d6112993d71169664a3c29e90b2.tar.bz2
volse-hubzilla-32614e4074758d6112993d71169664a3c29e90b2.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
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 {