clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2873 from rabuzarus/2410_fix_comment_nav_php 

function nav_info(): insert lost comment
This commit is contained in:
Tobias Diekershoff 2016-10-24 14:21:00 +02:00 committed by GitHub
parent cfea3cce77 b0d6c244c5
commit dedf6373b1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/nav.php
View File

@ -47,7 +47,11 @@ function nav(&$a) {
* @brief Prepares a list of navigation links * @brief Prepares a list of navigation links
* *
* @param App $a * @param App $a
* @return array * @return array Navigation links
* string 'sitelocation' => The webbie (username@site.com)
* array 'nav' => Array of links used in the nav menu
* string 'banner' => Formatted html link with banner image
* array 'userinfo' => Array of user information (name, icon)
*/ */
function nav_info(App $a) function nav_info(App $a)
{ {
@ -91,7 +95,7 @@ function nav_info(App $a)
$nav['login'] = array('login', t('Login'), ($a->module == 'login' ? 'selected' : ''), t('Sign in')); $nav['login'] = array('login', t('Login'), ($a->module == 'login' ? 'selected' : ''), t('Sign in'));
} }
// "Home" should also take you home from an authenticated remote profile connection // "Home" should also take you home from an authenticated remote profile connection
$homelink = get_my_url(); $homelink = get_my_url();
if (! $homelink) { if (! $homelink) {
$homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : ''); $homelink = ((x($_SESSION,'visitor_home')) ? $_SESSION['visitor_home'] : '');
@ -188,6 +192,7 @@ function nav_info(App $a)
$nav['contacts'] = array('contacts', t('Contacts'), '', t('Manage/edit friends and contacts')); $nav['contacts'] = array('contacts', t('Contacts'), '', t('Manage/edit friends and contacts'));
} }
// Show the link to the admin configuration page if user is admin
if (is_site_admin()) { if (is_site_admin()) {
$nav['admin'] = array('admin/', t('Admin'), '', t('Site setup and configuration')); $nav['admin'] = array('admin/', t('Admin'), '', t('Site setup and configuration'));
} }
@ -210,7 +215,6 @@ function nav_info(App $a)
); );
} }
/** /**
* Set a menu item in navbar as selected * Set a menu item in navbar as selected
* *