diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 13:28:38 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-29 02:14:33 +0200 |
| commit | 84a02f5cef6cd2cc4b8fb5e9e083e848df8d2a48 (patch) | |
| tree | 65e65e400d0d6227ade5a70cfbda6cc2d310548a /phpBB/phpbb/message/user_form.php | |
| parent | ef8d7b995e854c64a5f529978ee4898030ae9fa4 (diff) | |
| download | forums-84a02f5cef6cd2cc4b8fb5e9e083e848df8d2a48.tar forums-84a02f5cef6cd2cc4b8fb5e9e083e848df8d2a48.tar.gz forums-84a02f5cef6cd2cc4b8fb5e9e083e848df8d2a48.tar.bz2 forums-84a02f5cef6cd2cc4b8fb5e9e083e848df8d2a48.tar.xz forums-84a02f5cef6cd2cc4b8fb5e9e083e848df8d2a48.zip | |
[ticket/10073] Use get_username_string and correctly sprintf for languages
PHPBB3-10073
Diffstat (limited to 'phpBB/phpbb/message/user_form.php')
| -rw-r--r-- | phpBB/phpbb/message/user_form.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/phpbb/message/user_form.php b/phpBB/phpbb/message/user_form.php index 5e98590c58..7aa4b94def 100644 --- a/phpBB/phpbb/message/user_form.php +++ b/phpBB/phpbb/message/user_form.php @@ -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, )); |