aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2003-07-11 11:48:52 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2003-07-11 11:48:52 +0000
commite0b7709ae1afc8111ed54bd8f742a5bfd455994e (patch)
tree17c9ac9463cf3d264b0d9ba3e996284a386738d5
parent344fc7deb5f905ec65308edbaef2019e8bef4186 (diff)
downloadforums-e0b7709ae1afc8111ed54bd8f742a5bfd455994e.tar
forums-e0b7709ae1afc8111ed54bd8f742a5bfd455994e.tar.gz
forums-e0b7709ae1afc8111ed54bd8f742a5bfd455994e.tar.bz2
forums-e0b7709ae1afc8111ed54bd8f742a5bfd455994e.tar.xz
forums-e0b7709ae1afc8111ed54bd8f742a5bfd455994e.zip
fix small issue with empty username and password
git-svn-id: file:///svn/phpbb/trunk@4217 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/ucp/ucp_register.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php
index f6b9b51330..5ed69cf542 100644
--- a/phpBB/includes/ucp/ucp_register.php
+++ b/phpBB/includes/ucp/ucp_register.php
@@ -220,13 +220,13 @@ class ucp_register extends ucp
$emailer->template($email_template, $user->data['user_lang']);
$emailer->replyto($config['board_contact']);
- $emailer->to($data['user_email'], $data['username']);
+ $emailer->to($data['email'], $data['username']);
$emailer->assign_vars(array(
'SITENAME' => $config['sitename'],
'WELCOME_MSG' => sprintf($user->lang['Welcome_subject'], $config['sitename']),
- 'USERNAME' => $username,
- 'PASSWORD' => $password_confirm,
+ 'USERNAME' => $data['username'],
+ 'PASSWORD' => $data['password_confirm'],
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
'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->assign_vars(array(
- 'USERNAME' => $username,
+ 'USERNAME' => $data['username'],
'EMAIL_SIG' => str_replace('<br />', "\n", "-- \n" . $config['board_email_sig']),
'U_ACTIVATE' => generate_board_url() . "/ucp.$phpEx?mode=activate&k=$user_actkey")