diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-03 16:21:51 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-02-03 16:21:51 -0500 |
| commit | cddd63aae045a833e9a3ec4bb396b3987f95cbd3 (patch) | |
| tree | 69ac84e41f9333ec540fddb1d428c5bac97c0fd4 /phpBB/includes/ucp/ucp_profile.php | |
| parent | 6ad87d3aaf04fba5e58351c18fc78d1a9ee77dbb (diff) | |
| parent | ccf0cf649daabc600e8a79680e29c7bfbba32cac (diff) | |
| download | forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.gz forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.bz2 forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.tar.xz forums-cddd63aae045a833e9a3ec4bb396b3987f95cbd3.zip | |
Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535:
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/10535] Delete email confirm from installer
[ticket/10535] Removed email confirm field from acp_users module
[ticket/10535] Forgot a subsilver2 change. *doh*
[ticket/10535] Removed email confirm from UCP, removed unused language entries
[ticket/10535] Remove email confirm check on registration form
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index d0df70d2f5..9d81503f0a 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -46,7 +46,6 @@ 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'])), - 'email_confirm' => strtolower(request_var('email_confirm', '')), 'new_password' => request_var('new_password', '', true), 'cur_password' => request_var('cur_password', '', true), 'password_confirm' => request_var('password_confirm', '', true), @@ -65,7 +64,6 @@ class ucp_profile 'email' => array( array('string', false, 6, 60), array('email')), - 'email_confirm' => array('string', true, 6, 60), ); if ($auth->acl_get('u_chgname') && $config['allow_namechange']) @@ -78,11 +76,6 @@ class ucp_profile $error = validate_data($data, $check_ary); - if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email']) - { - $error[] = ($data['email_confirm']) ? 'NEW_EMAIL_ERROR' : 'NEW_EMAIL_CONFIRM_EMPTY'; - } - if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password']) { $error[] = ($data['password_confirm']) ? 'NEW_PASSWORD_ERROR' : 'NEW_PASSWORD_CONFIRM_EMPTY'; |