diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-12-03 13:46:41 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-12-03 13:46:41 +0100 |
| commit | 1b0a17c7dba1ca2ff5cc6d943d37abb14a5ec73c (patch) | |
| tree | 75fd03333e51465fa8512b17200eb604db25b166 /include/channel.php | |
| parent | fe7ecede700fe04631d23f36473e697ce2b364dc (diff) | |
| parent | 60b145833c5c07898363d51838a942b876f60c3c (diff) | |
| download | volse-hubzilla-1b0a17c7dba1ca2ff5cc6d943d37abb14a5ec73c.tar.gz volse-hubzilla-1b0a17c7dba1ca2ff5cc6d943d37abb14a5ec73c.tar.bz2 volse-hubzilla-1b0a17c7dba1ca2ff5cc6d943d37abb14a5ec73c.zip | |
Merge branch 'dev'
Diffstat (limited to 'include/channel.php')
| -rw-r--r-- | include/channel.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/channel.php b/include/channel.php index 927da3dcd..102a03489 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1566,7 +1566,7 @@ function profile_edit_menu($uid) { * @return string (HTML) suitable for sidebar inclusion * Exceptions: Returns empty string if passed $profile is wrong type or not populated */ -function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = false) { +function profile_sidebar($profile, $block = 0, $show_connect = true, $details = false) { $observer = App::get_observer(); @@ -1622,6 +1622,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False); $marital = ((x($profile,'marital') == 1) ? t('Status:') : False); $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False); + $hometown = ((x($profile,'hometown') == 1) ? t('Hometown:') : False); $profile['online'] = (($profile['online_status'] === 'online') ? t('Online Now') : False); // logger('online: ' . $profile['online']); @@ -1662,18 +1663,18 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa $tpl = get_markup_template('profile_vcard.tpl'); $o .= replace_macros($tpl, array( - '$zcard' => $zcard, + '$details' => $details, '$profile' => $profile, '$connect' => $connect, '$connect_url' => $connect_url, '$location' => $location, + '$hometown' => $hometown, '$gender' => $gender, '$pdesc' => $pdesc, '$marital' => $marital, '$homepage' => $homepage, '$chanmenu' => $channel_menu, '$reddress' => $reddress, - '$rating' => '', '$contact_block' => $contact_block, '$change_photo' => t('Change your profile photo'), '$editmenu' => profile_edit_menu($profile['uid']) |