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/acp/acp_users.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/acp/acp_users.php')
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index a282ef1d7f..97f4b1b5fd 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -756,7 +756,6 @@ class acp_users 'username' => utf8_normalize_nfc(request_var('user', $user_row['username'], true)), 'user_founder' => request_var('user_founder', ($user_row['user_type'] == USER_FOUNDER) ? 1 : 0), 'email' => strtolower(request_var('user_email', $user_row['user_email'])), - 'email_confirm' => strtolower(request_var('email_confirm', '')), 'new_password' => request_var('new_password', '', true), 'password_confirm' => request_var('password_confirm', '', true), ); @@ -788,7 +787,6 @@ class acp_users array('string', false, 6, 60), array('email', $user_row['user_email']) ), - 'email_confirm' => array('string', true, 6, 60) ); } @@ -799,11 +797,6 @@ class acp_users $error[] = 'NEW_PASSWORD_ERROR'; } - if ($data['email'] != $user_row['user_email'] && $data['email_confirm'] != $data['email']) - { - $error[] = 'NEW_EMAIL_ERROR'; - } - if (!check_form_key($form_name)) { $error[] = 'FORM_INVALID'; |