From 0dfce1abf34316f3be16e9e248860f84f94686e7 Mon Sep 17 00:00:00 2001 From: mark_story Date: Sat, 19 Jul 2014 19:57:33 -0400 Subject: [PATCH] Add `.` to the list of allowed characters. This was missed when the email validation rules were relaxed in dc34d80f6f622e883b8c7db9ef489bd514c8701f. Fixes #4027 --- lib/Cake/Network/Email/CakeEmail.php | 2 +- lib/Cake/Test/Case/Network/Email/CakeEmailTest.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Network/Email/CakeEmail.php b/lib/Cake/Network/Email/CakeEmail.php index 46bb4dc38f4..15db6745588 100644 --- a/lib/Cake/Network/Email/CakeEmail.php +++ b/lib/Cake/Network/Email/CakeEmail.php @@ -320,7 +320,7 @@ class CakeEmail { * * @var string */ - protected $_emailPattern = '/^((?:[\p{L}0-9!#$%&\'*+\/=?^_`{|}~-]+)*@[\p{L}0-9-.]+)$/ui'; + protected $_emailPattern = '/^((?:[\p{L}0-9.!#$%&\'*+\/=?^_`{|}~-]+)*@[\p{L}0-9-.]+)$/ui'; /** * The class name used for email configuration. diff --git a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php index 366867de8d4..b91e66e80d5 100644 --- a/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php +++ b/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php @@ -251,7 +251,7 @@ public function testTo() { $list = array( 'root@localhost' => 'root', 'bjørn@hammeröath.com' => 'Bjorn', - 'cake@cakephp.org' => 'Cake PHP', + 'cake.php@cakephp.org' => 'Cake PHP', 'cake-php@googlegroups.com' => 'Cake Groups', 'root@cakephp.org' ); @@ -259,7 +259,7 @@ public function testTo() { $expected = array( 'root@localhost' => 'root', 'bjørn@hammeröath.com' => 'Bjorn', - 'cake@cakephp.org' => 'Cake PHP', + 'cake.php@cakephp.org' => 'Cake PHP', 'cake-php@googlegroups.com' => 'Cake Groups', 'root@cakephp.org' => 'root@cakephp.org' ); @@ -271,7 +271,7 @@ public function testTo() { $expected = array( 'root@localhost' => 'root', 'bjørn@hammeröath.com' => 'Bjorn', - 'cake@cakephp.org' => 'Cake PHP', + 'cake.php@cakephp.org' => 'Cake PHP', 'cake-php@googlegroups.com' => 'Cake Groups', 'root@cakephp.org' => 'root@cakephp.org', 'jrbasso@cakephp.org' => 'jrbasso@cakephp.org',