diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-10-23 23:01:12 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-10-23 23:01:12 +0000 |
| commit | 2399844befb984fd51cf214e0916f1a3c7c49e59 (patch) | |
| tree | 9448ce5d1be11dbd9a07aedab0c0f02b961a9a80 /phpBB/includes | |
| parent | ad8fa012f5976cf4c08bf54192d19e97793bb4ca (diff) | |
| download | forums-2399844befb984fd51cf214e0916f1a3c7c49e59.tar forums-2399844befb984fd51cf214e0916f1a3c7c49e59.tar.gz forums-2399844befb984fd51cf214e0916f1a3c7c49e59.tar.bz2 forums-2399844befb984fd51cf214e0916f1a3c7c49e59.tar.xz forums-2399844befb984fd51cf214e0916f1a3c7c49e59.zip | |
#4962
git-svn-id: file:///svn/phpbb/trunk@6525 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index 30cbf918e8..189ee5c326 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -246,7 +246,7 @@ function mcp_post_details($id, $mode, $action) while ($row = $db->sql_fetchrow($result)) { $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); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index c1e507df29..26088df925 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -338,8 +338,8 @@ class ucp_register $messenger->assign_vars(array( 'SITENAME' => $config['sitename'], 'WELCOME_MSG' => sprintf($user->lang['WELCOME_SUBJECT'], $config['sitename']), - 'USERNAME' => html_entity_decode($username, ENT_COMPAT, 'UTF-8'), - 'PASSWORD' => html_entity_decode($password_confirm), + 'USERNAME' => html_entity_decode($user_row['username'], ENT_COMPAT, 'UTF-8'), + 'PASSWORD' => html_entity_decode($user_row['user_password']), '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") |