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 | |
| 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')
| -rw-r--r-- | phpBB/memberlist.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/message/user_form.php | 5 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/memberlist_email.html | 2 | ||||
| -rw-r--r-- | phpBB/styles/subsilver2/template/index_body.html | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 2e480a472e..1621e98220 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -667,6 +667,7 @@ switch ($mode) 'POSTS_IN_QUEUE'=> $member['posts_in_queue'], 'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']), + 'L_SEND_EMAIL_USER' => $user->lang('SEND_EMAIL_USER', $member['username']), 'EMAIL_IMG' => $user->img('icon_contact_email', $user->lang['EMAIL']), 'JABBER_IMG' => $user->img('icon_contact_jabber', $user->lang['JABBER']), 'SEARCH_IMG' => $user->img('icon_user_search', $user->lang['SEARCH']), 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, )); diff --git a/phpBB/styles/prosilver/template/memberlist_email.html b/phpBB/styles/prosilver/template/memberlist_email.html index b8366a073a..45e3fcc865 100644 --- a/phpBB/styles/prosilver/template/memberlist_email.html +++ b/phpBB/styles/prosilver/template/memberlist_email.html @@ -26,7 +26,7 @@ <!-- IF S_SEND_USER --> <dl> <dt><label>{L_RECIPIENT}{L_COLON}</label></dt> - <dd><strong>{USERNAME}</strong></dd> + <dd><strong>{USERNAME_FULL}</strong></dd> </dl> <dl> <dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt> diff --git a/phpBB/styles/subsilver2/template/index_body.html b/phpBB/styles/subsilver2/template/index_body.html index 52f04af35f..2fdd0c77c1 100644 --- a/phpBB/styles/subsilver2/template/index_body.html +++ b/phpBB/styles/subsilver2/template/index_body.html @@ -26,6 +26,7 @@ <!-- ENDIF --> <!-- EVENT overall_footer_teamlink_after --> </span> +<!-- ENDIF --> <br /> <br clear="all" /> |