Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix reset() not affecting delivery.

Fixes #2533
  • Loading branch information...
commit 6237111f5c9bc653371b6f67f760f3f08ff9b093 1 parent 83155c0
@markstory markstory authored
View
1  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();
View
1  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() {
Please sign in to comment.
Something went wrong with that request. Please try again.