aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/channel.php7
-rw-r--r--include/contact_widgets.php2
-rw-r--r--include/text.php2
3 files changed, 6 insertions, 5 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'])
diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index a5f867b0f..875a519a5 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -246,7 +246,7 @@ function filecategories_widget($baseurl,$selected = '') {
}
-function common_friends_visitor_widget($profile_uid,$cnt = 25) {
+function common_friends_visitor_widget($profile_uid,$cnt = 36) {
if(local_channel() == $profile_uid)
return;
diff --git a/include/text.php b/include/text.php
index 1b3a77dba..d46c089b5 100644
--- a/include/text.php
+++ b/include/text.php
@@ -987,7 +987,7 @@ function contact_block() {
$shown = get_pconfig(App::$profile['uid'],'system','display_friend_count');
if($shown === false)
- $shown = 25;
+ $shown = 36;
if($shown == 0)
return;