diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:42:53 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:42:53 +0100 |
| commit | d2a15d9afe06509ff3e9fe5b6463800f66813783 (patch) | |
| tree | 8785eca040f65292d8ed83b47afc873b922ff68f /phpBB/includes/functions_acp.php | |
| parent | 5361a14c1ed2a39db10df9252488185e6ad3c6ff (diff) | |
| download | forums-d2a15d9afe06509ff3e9fe5b6463800f66813783.tar forums-d2a15d9afe06509ff3e9fe5b6463800f66813783.tar.gz forums-d2a15d9afe06509ff3e9fe5b6463800f66813783.tar.bz2 forums-d2a15d9afe06509ff3e9fe5b6463800f66813783.tar.xz forums-d2a15d9afe06509ff3e9fe5b6463800f66813783.zip | |
[ticket/10896] Add missing email validation lost in develop merge
Fix incomplete merge, by adding a piece of code moved to another file in
olympus back.
PHPBB3-10896
Diffstat (limited to 'phpBB/includes/functions_acp.php')
| -rw-r--r-- | phpBB/includes/functions_acp.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/functions_acp.php b/phpBB/includes/functions_acp.php index 32fd76e74d..d6bd9e35dd 100644 --- a/phpBB/includes/functions_acp.php +++ b/phpBB/includes/functions_acp.php @@ -443,6 +443,13 @@ function validate_config_vars($config_vars, &$cfg_array, &$error) } break; + case 'email': + if (!preg_match('/^' . get_preg_expression('email') . '$/i', $cfg_array[$config_name])) + { + $error[] = $user->lang['EMAIL_INVALID_EMAIL']; + } + break; + // Absolute path case 'script_path': if (!$cfg_array[$config_name]) |