issue 2010 modified the regular expression of email. (add + . ~)

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11004 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-08-08 13:20:08 +00:00
parent 76a54f7077
commit 75a5398930
5 changed files with 74 additions and 191 deletions

View file

@ -204,7 +204,7 @@ class Argument {
switch ($filter_type) {
case 'email' :
case 'email_address' :
if (!preg_match('/^[_0-9a-z-]+(\.[_0-9a-z-]+)*@[0-9a-z-]+(\.[0-9a-z-]+)*$/is', $val)) {
if (!preg_match('/^[\w-]+((?:\.|\+|\~)[\w-]+)*@[\w-]+(\.[\w-]+)+$/is', $val)) {
$this->isValid = false;
$this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
}