Skip to content
This repository
Browse code

Fix reset() not affecting delivery.

Fixes #2533
  • Loading branch information...
commit 6237111f5c9bc653371b6f67f760f3f08ff9b093 1 parent 83155c0
Mark Story authored February 01, 2012
1  cake/libs/controller/components/email.php
@@ -438,6 +438,7 @@ function reset() {
438 438
 		$this->htmlMessage = null;
439 439
 		$this->textMessage = null;
440 440
 		$this->messageId = true;
  441
+		$this->delivery = 'mail';
441 442
 		$this->__header = array();
442 443
 		$this->__boundary = null;
443 444
 		$this->__message = array();
1  cake/tests/cases/libs/controller/components/email.test.php
@@ -1181,6 +1181,7 @@ function testReset() {
1181 1181
 		$this->assertIdentical($this->Controller->EmailTest->attachments, array());
1182 1182
 		$this->assertNull($this->Controller->EmailTest->textMessage);
1183 1183
 		$this->assertTrue($this->Controller->EmailTest->messageId);
  1184
+		$this->assertEqual('mail', $this->Controller->EmailTest->delivery);
1184 1185
 	}
1185 1186
 
1186 1187
 	function testPluginCustomViewClass() {

0 notes on commit 6237111

Please sign in to comment.
Something went wrong with that request. Please try again.