Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

  • Loading branch information...
commit 07234c930a17f10acbb6c0181dfbd8accec9ad3e 2 parents 1f6bc56 + 668a791
@markstory markstory authored
View
2  cake/VERSION.txt
@@ -17,4 +17,4 @@
// @license MIT License (http://www.opensource.org/licenses/mit-license.php)
// +--------------------------------------------------------------------------------------------+ //
////////////////////////////////////////////////////////////////////////////////////////////////////
-1.3.0-alpha
+1.3.0-beta
View
2  cake/config/config.php
@@ -19,5 +19,5 @@
* @since CakePHP(tm) v 1.1.11.4062
* @license MIT License (http://www.opensource.org/licenses/mit-license.php)
*/
-return $config['Cake.version'] = '1.3.0-alpha';
+return $config['Cake.version'] = '1.3.0-beta';
?>
View
2  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';
Please sign in to comment.
Something went wrong with that request. Please try again.