Support to multibyte in subject.

cakephp · Apr 17, 2011 · d5938dd · d5938dd
1 parent c48db36
commit d5938dd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/lib/Cake/Network/CakeEmail.php b/lib/Cake/Network/CakeEmail.php
@@ -475,7 +475,7 @@ public function subject($subject = null) {
 		if ($subject === null) {
 			return $this->_subject;
 		}
-		$this->_subject = (string)$subject;
+		$this->_subject = $this->_encode((string)$subject);
 		return $this;
 	}
 

diff --git a/lib/Cake/tests/Case/Network/CakeEmailTest.php b/lib/Cake/tests/Case/Network/CakeEmailTest.php
@@ -342,6 +342,10 @@ public function testSubject() {
 		$result = $this->CakeEmail->subject(array('something'));
 		$this->assertIdentical($this->CakeEmail->subject(), 'Array');
 		$this->assertIdentical($this->CakeEmail, $result);
+
+		$this->CakeEmail->subject('هذه رسالة بعنوان طويل مرسل للمستلم');
+		$expected = '=?UTF-8?B?2YfYsNmHINix2LPYp9mE2Kkg2KjYudmG2YjYp9mGINi32YjZitmEINmF2LE=?=' . "\r\n" . ' =?UTF-8?B?2LPZhCDZhNmE2YXYs9iq2YTZhQ==?=';
+		$this->assertIdentical($this->CakeEmail->subject(), $expected);
 	}
 
 /**