diff options
| author | David King <imkingdavid@gmail.com> | 2011-12-23 21:55:49 +0000 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2011-12-23 21:55:49 +0000 |
| commit | 4baa2bb52c47b0b0e316c3a25f34e7bc27075ffd (patch) | |
| tree | c56d6afe5f62163b8c02eafd7c40fd7b5d7ec171 | |
| parent | fd58a0ad374cfd535b0aff2f4bf1564a479fcdd0 (diff) | |
| download | forums-4baa2bb52c47b0b0e316c3a25f34e7bc27075ffd.tar forums-4baa2bb52c47b0b0e316c3a25f34e7bc27075ffd.tar.gz forums-4baa2bb52c47b0b0e316c3a25f34e7bc27075ffd.tar.bz2 forums-4baa2bb52c47b0b0e316c3a25f34e7bc27075ffd.tar.xz forums-4baa2bb52c47b0b0e316c3a25f34e7bc27075ffd.zip | |
[ticket/10535] Removed email confirm field from acp_users module
PHPBB3-10535
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index 9237e45daf..1f10e7f66e 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -46,10 +46,6 @@ <dd><input class="text medium" type="text" id="user_email" name="user_email" value="{USER_EMAIL}" autocomplete="off" /></dd> </dl> <dl> - <dt><label for="email_confirm">{L_CONFIRM_EMAIL}:</label><br /><span>{L_CONFIRM_EMAIL_EXPLAIN}</span></dt> - <dd><input class="text medium" type="text" id="email_confirm" name="email_confirm" value="" autocomplete="off" /></dd> -</dl> -<dl> <dt><label for="new_password">{L_NEW_PASSWORD}:</label><br /><span>{L_CHANGE_PASSWORD_EXPLAIN}</span></dt> <dd><input type="password" id="new_password" name="new_password" value="" autocomplete="off" /></dd> </dl> diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index c1ad28ca14..cf5650a901 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -757,7 +757,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), ); @@ -789,7 +788,6 @@ class acp_users array('string', false, 6, 60), array('email', $user_row['user_email']) ), - 'email_confirm' => array('string', true, 6, 60) ); } @@ -800,11 +798,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'; |