Applying patch from 'Mark Mitchell' fixes issues with sending Email v…

…ia smtp. Which were incorrect based on previous patches given for ticket #1100. Fixes #1205, Fixes #1204
cakephp · Oct 19, 2010 · 48c2c16 · 48c2c16
1 parent 3f6bee0
commit 48c2c16
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
@@ -619,9 +619,9 @@ function __encode($subject) {
 	function __formatAddress($string, $smtp = false) {
 		$hasAlias = preg_match('/((.*)\s)?<(.+)>/', $string, $matches);
 		if ($smtp && $hasAlias) {
-			return $this->__strip(' <' .  $matches[3] . '>');
+			return $this->__strip('<' .  $matches[3] . '>');
 		} elseif ($smtp) {
-			return $this->__strip(' <' . $string . '>');
+			return $this->__strip('<' . $string . '>');
 		}
 		if ($hasAlias && !empty($matches[2])) {
 			return $this->__strip($matches[2] . ' <' . $matches[3] . '>');
@@ -796,4 +796,4 @@ function __debug() {
 	}
 
 }
-?>
+?>
diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
@@ -694,13 +694,13 @@ function testFormatAddressAliases() {
 		$this->assertEqual($result, '<email@example.com>');
 
 		$result = $this->Controller->EmailTest->formatAddress('email@example.com', true);
-		$this->assertEqual($result, ' <email@example.com>');
+		$this->assertEqual($result, '<email@example.com>');
 
 		$result = $this->Controller->EmailTest->formatAddress('<email@example.com>', true);
-		$this->assertEqual($result, ' <email@example.com>');
+		$this->assertEqual($result, '<email@example.com>');
 
 		$result = $this->Controller->EmailTest->formatAddress('alias name <email@example.com>', true);
-		$this->assertEqual($result, ' <email@example.com>');
+		$this->assertEqual($result, '<email@example.com>');
 	}
 }
 ?>