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 · 1c25e62 · 1c25e62
1 parent 61864a3
commit 1c25e62
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
@@ -745,9 +745,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] . '>');

diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
@@ -1191,12 +1191,12 @@ 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>');
 	}
 }