Fix url in profile tabs
This commit is contained in:
parent
f64e2d63b9
commit
070e081ae9
8
boot.php
8
boot.php
|
@ -1162,14 +1162,16 @@ function load_contact_links($uid) {
|
||||||
}}
|
}}
|
||||||
|
|
||||||
if(! function_exists('profile_tabs')){
|
if(! function_exists('profile_tabs')){
|
||||||
function profile_tabs($a, $is_owner=False){
|
function profile_tabs($a, $is_owner=False, $nickname=Null){
|
||||||
//echo "<pre>"; var_dump($a->user); killme();
|
//echo "<pre>"; var_dump($a->user); killme();
|
||||||
|
|
||||||
|
if (is_null($nickname))
|
||||||
|
$nickname = $a->user['nickname'];
|
||||||
|
|
||||||
if(x($_GET,'tab'))
|
if(x($_GET,'tab'))
|
||||||
$tab = notags(trim($_GET['tab']));
|
$tab = notags(trim($_GET['tab']));
|
||||||
|
|
||||||
$url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
|
$url = $a->get_baseurl() . '/profile/' . $nickname;
|
||||||
|
|
||||||
$tabs = array(
|
$tabs = array(
|
||||||
array(
|
array(
|
||||||
|
@ -1184,7 +1186,7 @@ function profile_tabs($a, $is_owner=False){
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
'label' => t('Photos'),
|
'label' => t('Photos'),
|
||||||
'url' => $a->get_baseurl() . '/photos/' . $a->user['nickname'],
|
'url' => $a->get_baseurl() . '/photos/' . $nickname,
|
||||||
'sel' => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
|
'sel' => ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
|
@ -832,7 +832,7 @@ function photos_content(&$a) {
|
||||||
|
|
||||||
// tabs
|
// tabs
|
||||||
$_is_owner = (local_user() && (local_user() == $owner_uid));
|
$_is_owner = (local_user() && (local_user() == $owner_uid));
|
||||||
$o .= profile_tabs($a,$_is_owner);
|
$o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']);
|
||||||
|
|
||||||
//
|
//
|
||||||
// dispatch request
|
// dispatch request
|
||||||
|
|
|
@ -110,7 +110,7 @@ function profile_content(&$a, $update = 0) {
|
||||||
if(x($_GET,'tab'))
|
if(x($_GET,'tab'))
|
||||||
$tab = notags(trim($_GET['tab']));
|
$tab = notags(trim($_GET['tab']));
|
||||||
|
|
||||||
$o.=profile_tabs($a, $is_owner);
|
$o.=profile_tabs($a, $is_owner, $a->profile['nickname']);
|
||||||
|
|
||||||
|
|
||||||
if($tab === 'profile') {
|
if($tab === 'profile') {
|
||||||
|
|
Loading…
Reference in a new issue