Permalink
Browse files

Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3

  • Loading branch information...
2 parents f10d7dd + ab666f8 commit 668a791171886c55d169625cac4bf8c93ff0c4c2 @markstory markstory committed Jan 17, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 cake/libs/controller/components/email.php
@@ -505,8 +505,8 @@ function __createHeader() {
}
}
- $this->__createBoundary();
if (!empty($this->attachments)) {
+ $this->__createBoundary();
$this->__header[] = 'MIME-Version: 1.0';
$this->__header[] = 'Content-Type: multipart/mixed; boundary="' . $this->__boundary . '"';
$this->__header[] = 'This part of the E-mail should never be seen. If';

0 comments on commit 668a791

Please sign in to comment.