diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:39:04 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-02-24 17:39:04 +0100 |
| commit | 678ec7b545e6780b1192d6fdf358692c9431bb17 (patch) | |
| tree | 08f0c6e932673e4bfab7948d21a7b6401f0fe7f7 /phpBB/adm/index.php | |
| parent | f29bebc7ce367dda4851c83d78e2a61428f63c9d (diff) | |
| parent | 5aec7600a68adb9466fb7ce034ba22070ac8a244 (diff) | |
| download | forums-678ec7b545e6780b1192d6fdf358692c9431bb17.tar forums-678ec7b545e6780b1192d6fdf358692c9431bb17.tar.gz forums-678ec7b545e6780b1192d6fdf358692c9431bb17.tar.bz2 forums-678ec7b545e6780b1192d6fdf358692c9431bb17.tar.xz forums-678ec7b545e6780b1192d6fdf358692c9431bb17.zip | |
Merge remote-tracking branch 'github-exreaction/ticket/10896' into develop-olympus
* github-exreaction/ticket/10896:
[ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
[ticket/10896] Adds email validation to email settings in ACP
Diffstat (limited to 'phpBB/adm/index.php')
| -rw-r--r-- | phpBB/adm/index.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/adm/index.php b/phpBB/adm/index.php index 2e4089c02e..85908476a1 100644 --- a/phpBB/adm/index.php +++ b/phpBB/adm/index.php @@ -449,6 +449,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]) |