diff options
| author | robocoder <anthon.pang@gmail.com> | 2011-07-21 06:12:37 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2011-07-21 06:12:37 +0400 |
| commit | 9d8890ff20f1239e708d6d214f66dfa2cf3031e4 (patch) | |
| tree | 9752e603d54629d4375c84e0478eab2aab19430b /libs/Zend/Validate | |
| parent | 27f903dac205ff917305b9de5984c180782c4436 (diff) | |
fixes #2581
git-svn-id: http://dev.piwik.org/svn/trunk@5034 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'libs/Zend/Validate')
| -rw-r--r-- | libs/Zend/Validate/EmailAddress.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/Zend/Validate/EmailAddress.php b/libs/Zend/Validate/EmailAddress.php index dba6e286ce..6cc567daea 100644 --- a/libs/Zend/Validate/EmailAddress.php +++ b/libs/Zend/Validate/EmailAddress.php @@ -16,7 +16,7 @@ * @package Zend_Validate * @copyright Copyright (c) 2005-2011 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * @version $Id: EmailAddress.php 23775 2011-03-01 17:25:24Z ralph $ + * @version $Id: EmailAddress.php 24125 2011-06-07 16:13:26Z adamlundrigan $ */ /** @@ -527,8 +527,9 @@ class Zend_Validate_EmailAddress extends Zend_Validate_Abstract $this->_setValue($value); // Split email address up and disallow '..' + // and disallow addresses ending with a '.' if ((strpos($value, '..') !== false) or - (!preg_match('/^(.+)@([^@]+)$/', $value, $matches))) { + (!preg_match('/^(.+)@([^@]+[^.])$/', $value, $matches))) { $this->_error(self::INVALID_FORMAT); return false; } |