Merge pull request #3786 from tobiasd/3.5.4-CHANGELOG

[friendica.git] / include / nav.php

diff --git a/include/nav.php b/include/nav.php
index 7966096368e2aa8a300ff551acab6b9051bc52ec..d7a6e397c603162efdee4e551cc9725d0a777ead 100644 (file)
--- a/include/nav.php
+++ b/include/nav.php
@@ -31,7 +31,7 @@ function nav(App $a) {
        $tpl = get_markup_template('nav.tpl');
 
        $a->page['nav'] .= replace_macros($tpl, array(
-               '$baseurl' => App::get_baseurl(),
+               '$baseurl' => System::baseUrl(),
                '$sitelocation' => $nav_info['sitelocation'],
                '$nav' => $nav_info['nav'],
                '$banner' => $nav_info['banner'],
@@ -68,7 +68,7 @@ function nav_info(App $a)
 
        $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : '');
 
-       $sitelocation = $myident . substr(App::get_baseurl($ssl_state), strpos(App::get_baseurl($ssl_state), '//') + 2 );
+       $sitelocation = $myident . substr(System::baseUrl($ssl_state), strpos(System::baseUrl($ssl_state), '//') + 2 );
 
        // nav links: array of array('href', 'text', 'extra css classes', 'title')
        $nav = array();
@@ -205,7 +205,7 @@ function nav_info(App $a)
        // Provide a banner/logo/whatever
        $banner = get_config('system', 'banner');
        if ($banner === false) {
-               $banner = '<a href="http://friendica.com"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="http://friendica.com">Friendica</a></span>';
+               $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
        }
 
        call_hooks('nav_info', $nav);