diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-12 17:09:12 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-12 17:09:12 -0500 |
| commit | 94a3dc5ff7292c8271dfcff9408aa89d401b72ac (patch) | |
| tree | 6c7bd95bc177a40ee8f7e81fc3f2333c53363a8d /phpBB/includes/ucp | |
| parent | 3d79ce28031b4c85ee34bd4d43f0c64b18b1a80b (diff) | |
| parent | f1a692a5f45d993fe2578f13d365ca10543696f8 (diff) | |
| download | forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.gz forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.bz2 forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.xz forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 2ac82fb52f..89bf20a30f 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -46,9 +46,9 @@ class ucp_profile $data = array( 'username' => utf8_normalize_nfc(request_var('username', $user->data['username'], true)), 'email' => strtolower(request_var('email', $user->data['user_email'])), - 'new_password' => request_var('new_password', '', true), - 'cur_password' => request_var('cur_password', '', true), - 'password_confirm' => request_var('password_confirm', '', true), + 'new_password' => $request->variable('new_password', '', true), + 'cur_password' => $request->variable('cur_password', '', true), + 'password_confirm' => $request->variable('password_confirm', '', true), ); add_form_key('ucp_reg_details'); diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index 6ce53a79ab..c57aec00a0 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -170,8 +170,8 @@ class ucp_register $data = array( 'username' => utf8_normalize_nfc(request_var('username', '', true)), - 'new_password' => request_var('new_password', '', true), - 'password_confirm' => request_var('password_confirm', '', true), + 'new_password' => $request->variable('new_password', '', true), + 'password_confirm' => $request->variable('password_confirm', '', true), 'email' => strtolower(request_var('email', '')), 'lang' => basename(request_var('lang', $user->lang_name)), 'tz' => request_var('tz', $timezone), |