aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-06-25 19:36:18 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-06-25 19:36:18 +0200
commit8b00be6fce7a992a4a6d86a399ea45d24fe1dcea (patch)
treef4df2478ef544edc8d0fc4fcaa659d10fb93f77f /phpBB/includes
parent5265091c83d4fc2228e1840c47e727c11d59de3c (diff)
parentaff67b99b5f1fcb2df20e0adc47e13aa0f4f695e (diff)
downloadforums-8b00be6fce7a992a4a6d86a399ea45d24fe1dcea.tar
forums-8b00be6fce7a992a4a6d86a399ea45d24fe1dcea.tar.gz
forums-8b00be6fce7a992a4a6d86a399ea45d24fe1dcea.tar.bz2
forums-8b00be6fce7a992a4a6d86a399ea45d24fe1dcea.tar.xz
forums-8b00be6fce7a992a4a6d86a399ea45d24fe1dcea.zip
Merge pull request #2567 from Crizz0/ticket/12680
[Ticket/12680] - Adds alternative text to contact icon in viewtopic.php * Crizz0/ticket/12680: [ticket/12680] Adds variable for guest user [ticket/12680] Brings back get_username_string() [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname [ticket/12680] Still some problems with displaying the nickname in ucp [ticket/12680] Little changes, but some issues are still there [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER [ticket/12680] Adds alternativ text with new variable to contact: [ticket/12680] Adds second alternativ text and font-size: 0 to remove text [ticket/12680] Adds alternative text to contact icon in viewtopic.php
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index fc568abc68..f42200d249 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -204,6 +204,7 @@ function view_message($id, $mode, $folder_id, $msg_id, $folder, $message_row)
'AUTHOR_AVATAR' => (isset($user_info['avatar'])) ? $user_info['avatar'] : '',
'AUTHOR_JOINED' => $user->format_date($user_info['user_regdate']),
'AUTHOR_POSTS' => (int) $user_info['user_posts'],
+ 'CONTACT_USER' => $user->lang('CONTACT_USER', get_username_string('username', $author_id, $user_info['username'], $user_info['user_colour'], $user_info['username'])),
'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : ((isset($user_info['online']) && $user_info['online']) ? $user->img('icon_user_online', $user->lang['ONLINE']) : $user->img('icon_user_offline', $user->lang['OFFLINE'])),
'S_ONLINE' => (!$config['load_onlinetrack']) ? false : ((isset($user_info['online']) && $user_info['online']) ? true : false),