diff options
author | Marc Alexander <admin@m-a-styles.de> | 2013-03-04 00:22:15 +0100 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2013-03-04 00:22:15 +0100 |
commit | d26ad8ed2693b03a12eec4deec729e972579e5d9 (patch) | |
tree | 5e5089616cc4b398c1c698154ff5fdac8f6d1476 /phpBB/includes/functions_acp.php | |
parent | 8a9e1ca3f176946bc7b8ddb9be30ca8607685b80 (diff) | |
parent | bee4f8d8185d4ff5278be758db4ea4a814f09b4f (diff) | |
download | forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.gz forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.bz2 forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.tar.xz forums-d26ad8ed2693b03a12eec4deec729e972579e5d9.zip |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars
Conflicts:
phpBB/install/database_update.php
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]) |