makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/memberlist.php
View file

@ -667,6 +667,7 @@ switch ($mode)
'POSTS_IN_QUEUE'=> $member['posts_in_queue'], 'POSTS_IN_QUEUE'=> $member['posts_in_queue'],
'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']), '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']), 'EMAIL_IMG' => $user->img('icon_contact_email', $user->lang['EMAIL']),
'JABBER_IMG' => $user->img('icon_contact_jabber', $user->lang['JABBER']), 'JABBER_IMG' => $user->img('icon_contact_jabber', $user->lang['JABBER']),
'SEARCH_IMG' => $user->img('icon_user_search', $user->lang['SEARCH']), 'SEARCH_IMG' => $user->img('icon_user_search', $user->lang['SEARCH']),

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) 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 . ' FROM ' . USERS_TABLE . '
WHERE user_id = ' . (int) $user_id . ' WHERE user_id = ' . (int) $user_id . '
AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')'; AND user_type IN (' . USER_NORMAL . ', ' . USER_FOUNDER . ')';
@ -125,7 +125,8 @@ class user_form extends form
'S_SEND_USER' => true, 'S_SEND_USER' => true,
'S_POST_ACTION' => append_sid($this->phpbb_root_path . 'memberlist.' . $this->phpEx, 'mode=email&u=' . $this->recipient_id), '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, 'SUBJECT' => $this->subject,
'MESSAGE' => $this->body, 'MESSAGE' => $this->body,
)); ));

2
phpBB/styles/prosilver/template/memberlist_email.html
View file

@ -26,7 +26,7 @@
<!-- IF S_SEND_USER --> <!-- IF S_SEND_USER -->
<dl> <dl>
<dt><label>{L_RECIPIENT}{L_COLON}</label></dt> <dt><label>{L_RECIPIENT}{L_COLON}</label></dt>
<dd><strong>{USERNAME}</strong></dd> <dd><strong>{USERNAME_FULL}</strong></dd>
</dl> </dl>
<dl> <dl>
<dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt> <dt><label for="subject">{L_SUBJECT}{L_COLON}</label></dt>

1
phpBB/styles/subsilver2/template/index_body.html
View file

@ -26,6 +26,7 @@
<!-- ENDIF --> <!-- ENDIF -->
<!-- EVENT overall_footer_teamlink_after --> <!-- EVENT overall_footer_teamlink_after -->
</span> </span>
<!-- ENDIF -->
<br /> <br />
<br clear="all" /> <br clear="all" />