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

cakephp · Jan 17, 2010 · 92ff9cc · 92ff9cc
2 parents 0e09fee + b50b592
commit 92ff9cc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/cake/libs/controller/components/email.php b/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';