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

This commit is contained in:
Mark Story 2010-01-16 20:15:13 -05:00
commit 92ff9ccae0

View file

@ -505,8 +505,8 @@ class EmailComponent extends Object{
}
}
if (!empty($this->attachments)) {
$this->__createBoundary();
if (!empty($this->attachments)) {
$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';