aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
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/viewtopic.php
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/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index d13d4b444f..d87f7de2b0 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1141,6 +1141,7 @@ while ($row = $db->sql_fetchrow($result))
'username' => $row['username'],
'user_colour' => $row['user_colour'],
+ 'contact_user' => '',
'warnings' => 0,
'allow_pm' => 0,
@@ -1198,6 +1199,7 @@ while ($row = $db->sql_fetchrow($result))
'username' => $row['username'],
'user_colour' => $row['user_colour'],
+ 'contact_user' => $user->lang('CONTACT_USER', get_username_string('username', $poster_id, $row['username'], $row['user_colour'], $row['username'])),
'online' => false,
'jabber' => ($row['user_jabber'] && $auth->acl_get('u_sendim')) ? append_sid("{$phpbb_root_path}memberlist.$phpEx", "mode=contact&amp;action=jabber&amp;u=$poster_id") : '',
@@ -1699,6 +1701,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i)
'POSTER_AVATAR' => $user_cache[$poster_id]['avatar'],
'POSTER_WARNINGS' => $auth->acl_get('m_warn') ? $user_cache[$poster_id]['warnings'] : '',
'POSTER_AGE' => $user_cache[$poster_id]['age'],
+ 'CONTACT_USER' => $user_cache[$poster_id]['contact_user'],
'POST_DATE' => $user->format_date($row['post_time'], false, ($view == 'print') ? true : false),
'POST_SUBJECT' => $row['post_subject'],