mirror of
https://github.com/phpbb/phpbb.git
synced 2025-05-05 23:25:30 +02:00
fix small issue with empty username and password
git-svn-id: file:///svn/phpbb/trunk@4217 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
344fc7deb5
commit
e0b7709ae1
@ -220,13 +220,13 @@ class ucp_register extends ucp
|
|||||||
|
|
||||||
$emailer->template($email_template, $user->data['user_lang']);
|
$emailer->template($email_template, $user->data['user_lang']);
|
||||||
$emailer->replyto($config['board_contact']);
|
$emailer->replyto($config['board_contact']);
|
||||||
$emailer->to($data['user_email'], $data['username']);
|
$emailer->to($data['email'], $data['username']);
|
||||||
|
|
||||||
$emailer->assign_vars(array(
|
$emailer->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' => $username,
|
'USERNAME' => $data['username'],
|
||||||
'PASSWORD' => $password_confirm,
|
'PASSWORD' => $data['password_confirm'],
|
||||||
'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&k=$user_actkey")
|
'U_ACTIVATE' => "$server_url/ucp.$phpEx?mode=activate&k=$user_actkey")
|
||||||
@ -252,7 +252,7 @@ class ucp_register extends ucp
|
|||||||
$emailer->to($config['board_contact']);
|
$emailer->to($config['board_contact']);
|
||||||
|
|
||||||
$emailer->assign_vars(array(
|
$emailer->assign_vars(array(
|
||||||
'USERNAME' => $username,
|
'USERNAME' => $data['username'],
|
||||||
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
|
||||||
|
|
||||||
'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&k=$user_actkey")
|
'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&k=$user_actkey")
|
||||||
|
Loading…
x
Reference in New Issue
Block a user