diff options
| author | David King <imkingdavid@gmail.com> | 2011-12-15 23:15:24 +0000 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2011-12-15 23:15:24 +0000 |
| commit | d73c3a297e1f31320c054685d5e38cb72a6357f3 (patch) | |
| tree | f2c006233f061cf8123daa9d8a94b4e433e9baa7 /phpBB/includes/ucp | |
| parent | 18aa4e4ecd55b846ead8e15853164bb5742099ef (diff) | |
| download | forums-d73c3a297e1f31320c054685d5e38cb72a6357f3.tar forums-d73c3a297e1f31320c054685d5e38cb72a6357f3.tar.gz forums-d73c3a297e1f31320c054685d5e38cb72a6357f3.tar.bz2 forums-d73c3a297e1f31320c054685d5e38cb72a6357f3.tar.xz forums-d73c3a297e1f31320c054685d5e38cb72a6357f3.zip | |
[ticket/10535] Removed email confirm from UCP, removed unused language entries
PHPBB3-10535
Diffstat (limited to 'phpBB/includes/ucp')
| -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 6eb11e6e59..2bc438e042 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -47,7 +47,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), @@ -66,7 +65,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']) @@ -79,11 +77,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'; |