Renamed the default X-Mailer value.

cakephp · Apr 23, 2011 · 6a7b42f · 6a7b42f
1 parent 636b480
commit 6a7b42f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/lib/Cake/Controller/Component/EmailComponent.php b/lib/Cake/Controller/Component/EmailComponent.php
@@ -333,7 +333,7 @@ public function send($content = null, $template = null, $layout = null) {
 
 		$lib->subject($this->subject)->messageID($this->messageId);
 
-		$headers = array();
+		$headers = array('X-Mailer' => $this->xMailer);
 		foreach ($this->headers as $key => $value) {
 			$headers['X-' . $key] = $value;
 		}

diff --git a/lib/Cake/Network/CakeEmail.php b/lib/Cake/Network/CakeEmail.php
@@ -32,11 +32,11 @@
  */
 class CakeEmail {
 /**
- * What mailer should EmailComponent identify itself as
+ * Default X-Mailer
  *
  * @constant EMAIL_CLIENT
  */
-	const EMAIL_CLIENT = 'CakePHP Email Component';
+	const EMAIL_CLIENT = 'CakePHP Email';
 
 /**
  * Line length - no should more - RFC 2822 - 2.1.1
@@ -943,9 +943,7 @@ public function send($content = null) {
 
 		if (!empty($this->_attachments)) {
 			$this->_attachFiles();
-		}
 
-		if (!empty($this->_attachments)) {
 			$this->_message[] = '';
 			$this->_message[] = '--' . $this->_boundary . '--';
 			$this->_message[] = '';

diff --git a/lib/Cake/tests/Case/Network/CakeEmailTest.php b/lib/Cake/tests/Case/Network/CakeEmailTest.php
@@ -390,7 +390,7 @@ public function testHeaders() {
 		$this->CakeEmail->setHeaders(array('X-Something' => 'nice'));
 		$expected = array(
 			'X-Something' => 'nice',
-			'X-Mailer' => 'CakePHP Email Component',
+			'X-Mailer' => 'CakePHP Email',
 			'Date' => date(DATE_RFC2822),
 			'MIME-Version' => '1.0',
 			'Content-Type' => 'text/plain; charset=UTF-8',
@@ -402,7 +402,7 @@ public function testHeaders() {
 		$expected = array(
 			'X-Something' => 'very nice',
 			'X-Other' => 'cool',
-			'X-Mailer' => 'CakePHP Email Component',
+			'X-Mailer' => 'CakePHP Email',
 			'Date' => date(DATE_RFC2822),
 			'MIME-Version' => '1.0',
 			'Content-Type' => 'text/plain; charset=UTF-8',
@@ -417,7 +417,7 @@ public function testHeaders() {
 			'From' => 'cake@cakephp.org',
 			'X-Something' => 'very nice',
 			'X-Other' => 'cool',
-			'X-Mailer' => 'CakePHP Email Component',
+			'X-Mailer' => 'CakePHP Email',
 			'Date' => date(DATE_RFC2822),
 			'MIME-Version' => '1.0',
 			'Content-Type' => 'text/plain; charset=UTF-8',
@@ -435,7 +435,7 @@ public function testHeaders() {
 			'To' => 'cake@cakephp.org, CakePHP <php@cakephp.org>',
 			'X-Something' => 'very nice',
 			'X-Other' => 'cool',
-			'X-Mailer' => 'CakePHP Email Component',
+			'X-Mailer' => 'CakePHP Email',
 			'Date' => date(DATE_RFC2822),
 			'MIME-Version' => '1.0',
 			'Content-Type' => 'text/plain; charset=UTF-8',