mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/10073] Use get_username_string and correctly sprintf for languages

Browse Source 
PHPBB3-10073
This commit is contained in:
Joas Schilling
2014-05-03 13:28:38 +02:00
parent ef8d7b995e
commit 84a02f5cef
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/phpbb/message/user_form.php
View File

@@ -32,7 +32,7 @@ class user_form extends form
*/
protected function get_user_row($user_id)
{
$sql = 'SELECT username, user_email, user_allow_viewemail, user_lang, user_jabber, user_notify_type
$sql = 'SELECT user_id, username, user_colour, user_email, user_allow_viewemail, user_lang, user_jabber, user_notify_type
FROM ' . USERS_TABLE . '
WHERE user_id = ' . (int) $user_id . '
AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')';
@@ -125,7 +125,8 @@ class user_form extends form
'S_SEND_USER' => true,
'S_POST_ACTION' => append_sid($this->phpbb_root_path . 'memberlist.' . $this->phpEx, 'mode=email&u=' . $this->recipient_id),
'USERNAME' => $this->recipient_row['username'],
'L_SEND_EMAIL_USER' => $this->user->lang('SEND_EMAIL_USER', $this->recipient_row['username']),
'USERNAME_FULL' => get_username_string('full', $this->recipient_row['user_id'], $this->recipient_row['username'], $this->recipient_row['user_colour']),
'SUBJECT' => $this->subject,
'MESSAGE' => $this->body,
));