mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
git-svn-id: file:///svn/phpbb/trunk@6525 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
ad8fa012f5
commit
2399844bef
2 changed files with 3 additions and 3 deletions
|
@ -246,7 +246,7 @@ function mcp_post_details($id, $mode, $action)
|
||||||
while ($row = $db->sql_fetchrow($result))
|
while ($row = $db->sql_fetchrow($result))
|
||||||
{
|
{
|
||||||
$users_ary[$row['user_id']]['username'] = $row['username'];
|
$users_ary[$row['user_id']]['username'] = $row['username'];
|
||||||
$usernames_ary[utf8_sclean_string($row['username'])] = $users_ary[$row['user_id']];
|
$usernames_ary[utf8_clean_string($row['username'])] = $users_ary[$row['user_id']];
|
||||||
}
|
}
|
||||||
$db->sql_freeresult($result);
|
$db->sql_freeresult($result);
|
||||||
|
|
||||||
|
|
|
@ -338,8 +338,8 @@ class ucp_register
|
||||||
$messenger->assign_vars(array(
|
$messenger->assign_vars(array(
|
||||||
'SITENAME' => $config['sitename'],
|
'SITENAME' => $config['sitename'],
|
||||||
'WELCOME_MSG' => sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']),
|
'WELCOME_MSG' => sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']),
|
||||||
'USERNAME' => html_entity_decode($username, ENT_COMPAT, 'UTF-8'),
|
'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT, 'UTF-8'),
|
||||||
'PASSWORD' => html_entity_decode($password_confirm),
|
'PASSWORD' => html_entity_decode($user_row['user_password']),
|
||||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
||||||
|
|
||||||
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
|
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&u=$user_id&k=$user_actkey")
|
||||||
|
|
Loading…
Add table
Reference in a new issue