Fix reset() not affecting delivery.

Fixes #2533
cakephp · Feb 2, 2012 · 6237111 · 6237111
1 parent 83155c0
commit 6237111
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php
@@ -438,6 +438,7 @@ function reset() {
 		$this->htmlMessage = null;
 		$this->textMessage = null;
 		$this->messageId = true;
+		$this->delivery = 'mail';
 		$this->__header = array();
 		$this->__boundary = null;
 		$this->__message = array();

diff --git a/cake/tests/cases/libs/controller/components/email.test.php b/cake/tests/cases/libs/controller/components/email.test.php
@@ -1181,6 +1181,7 @@ function testReset() {
 		$this->assertIdentical($this->Controller->EmailTest->attachments, array());
 		$this->assertNull($this->Controller->EmailTest->textMessage);
 		$this->assertTrue($this->Controller->EmailTest->messageId);
+		$this->assertEqual('mail', $this->Controller->EmailTest->delivery);
 	}
 
 	function testPluginCustomViewClass() {