diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-03-19 12:24:40 +0100 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-03-19 12:24:40 +0100 |
| commit | ea4be0db89b5e95b50211e023e94aa008aadae46 (patch) | |
| tree | 2d0654cae606cb3e543463e5569c2b2e689e45d6 /include/nav.php | |
| parent | c30342e2f7bde6fda899193f97ce3051cd8b2fdd (diff) | |
| parent | 2349852b4abd1638624b541f173f51d1fb1ea011 (diff) | |
| download | volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.tar.gz volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.tar.bz2 volse-hubzilla-ea4be0db89b5e95b50211e023e94aa008aadae46.zip | |
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'include/nav.php')
| -rwxr-xr-x | include/nav.php | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/nav.php b/include/nav.php index aadfa82fd..e28081839 100755 --- a/include/nav.php +++ b/include/nav.php @@ -8,6 +8,8 @@ function nav(&$a) { * */ + $ssl_state = ((local_user()) ? true : false); + if(!(x($a->page,'nav'))) $a->page['nav'] = ''; @@ -27,7 +29,7 @@ function nav(&$a) { $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : ''); - $sitelocation = $myident . substr($a->get_baseurl(),strpos($a->get_baseurl(),'//') + 2 ); + $sitelocation = $myident . substr($a->get_baseurl($ssl_state),strpos($a->get_baseurl($ssl_state),'//') + 2 ); // nav links: array of array('href', 'text', 'extra css classes', 'title') @@ -53,7 +55,7 @@ function nav(&$a) { // user info $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl()."/images/default-profile-mm.jpg"), + 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl($ssl_state)."/images/default-profile-mm.jpg"), 'name' => $a->user['username'], ); @@ -76,7 +78,7 @@ function nav(&$a) { if(($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) $nav['register'] = array('register',t('Register'), "", t('Create an account')); - $help_url = $a->get_baseurl() . '/help'; + $help_url = $a->get_baseurl($ssl_state) . '/help'; if(! get_config('system','hide_help')) $nav['help'] = array($help_url, t('Help'), "", t('Help and documentation')); |