From 25c0c5d4ad9e155dd5329e197c7a19212d20b578 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sat, 28 Nov 2015 18:49:37 +0100 Subject: [PATCH] Issue 1925 - display nickname@hostname.com --- include/text.php | 7 +++++-- mod/viewcontacts.php | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/text.php b/include/text.php index f210bff721..73c441e26a 100644 --- a/include/text.php +++ b/include/text.php @@ -943,6 +943,9 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($class) $class = ' ' . $class; + if ($contact["addr"] == "") + $contact["addr"] = $contact["url"]; + $url = $contact['url']; $sparkle = ''; $redir = false; @@ -966,7 +969,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { . (($click) ? ' fakelink' : '') . '" ' . (($redir) ? ' target="redir" ' : '') . (($url) ? ' href="' . $url . '"' : '') . $click - . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] + . '" title="' . $contact['name'] . ' [' . $contact['addr'] . ']" alt="' . $contact['name'] . '" >'. $contact['name'] . '' . "\r\n"; } else { @@ -974,7 +977,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { . (($click) ? ' fakelink' : '') . '" ' . (($redir) ? ' target="redir" ' : '') . (($url) ? ' href="' . $url . '"' : '') . $click . ' >' . $contact['name'] + . proxy_url($contact['micro'], false, PROXY_SIZE_THUMB) . '' . "\r\n"; } }} diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php index c7f139e1e4..c3bf3964f7 100644 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -64,6 +64,7 @@ function viewcontacts_content(&$a) { $contacts[] = array( 'id' => $rr['id'], 'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']), + 'photo_menu' => contact_photo_menu($rr), 'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB), 'name' => htmlentities(substr($rr['name'],0,20)), 'username' => htmlentities($rr['name']), -- 2.39.5