diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-06-09 17:55:59 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-06-09 17:55:59 +0200 |
| commit | 7a55594e93eccf8642a11b45922848176ee44a25 (patch) | |
| tree | f853b44efe766185dba8f006f6c8c502b60b1ce1 /phpBB/includes/ucp | |
| parent | 0440d09dc0886f590b7775aca13c4b15a0048599 (diff) | |
| parent | b6232aa9b213fbf62f5ce351bc79220daf243cc6 (diff) | |
| download | forums-7a55594e93eccf8642a11b45922848176ee44a25.tar forums-7a55594e93eccf8642a11b45922848176ee44a25.tar.gz forums-7a55594e93eccf8642a11b45922848176ee44a25.tar.bz2 forums-7a55594e93eccf8642a11b45922848176ee44a25.tar.xz forums-7a55594e93eccf8642a11b45922848176ee44a25.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: (36 commits)
[ticket/10073] Fix button descriptions
[ticket/10073] Do not check disable boxes by default
[ticket/10073] Store values with config_text in the ACP
[ticket/10073] Move config values to config_text
[ticket/10073] Fix request usage
[ticket/10073] Deduplicate template variable names
[ticket/10073] Get service from container
[ticket/10073] Fix more "Contact Us" strings
[ticket/10073] Move template code into the template
[ticket/10073] Make contact page available when board is disabled
[ticket/10073] Change name of the ACP module
[ticket/10073] Deduplicate posting buttons code in ACP
[ticket/10073] Use phpbb_validate_email to verify email address
[ticket/10073] Add tests for new validate_email()
[ticket/10073] Split email validation from email ban and taken checks
[ticket/10073] Deduplicate the if statement
[ticket/10073] Fallback to board_contact when contact page is disabled
[ticket/10073] Remove language string from rebase conflict
[ticket/10073] Add ACP module to add bbcode text for contact admin info
[ticket/10073] Add new configs to the schema
...
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_register.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index c7ed12f4ee..5ba5f1e830 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -66,7 +66,7 @@ class ucp_profile 'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars']), 'email' => array( array('string', false, 6, 60), - array('email')), + array('user_email')), ); if ($auth->acl_get('u_chgname') && $config['allow_namechange']) diff --git a/phpBB/includes/ucp/ucp_register.php b/phpBB/includes/ucp/ucp_register.php index cdd5532429..97934fc32d 100644 --- a/phpBB/includes/ucp/ucp_register.php +++ b/phpBB/includes/ucp/ucp_register.php @@ -211,7 +211,7 @@ class ucp_register 'password_confirm' => array('string', false, $config['min_pass_chars'], $config['max_pass_chars']), 'email' => array( array('string', false, 6, 60), - array('email')), + array('user_email')), 'tz' => array('timezone'), 'lang' => array('language_iso_name'), )); |