From f10d7dde75ff50b3f6c251590e6c73524d3d7284 Mon Sep 17 00:00:00 2001 From: Mark Story Date: Sat, 16 Jan 2010 20:38:08 -0500 Subject: [PATCH 1/2] Updating version numbers. to 1.3.0-beta --- cake/VERSION.txt | 2 +- cake/config/config.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cake/VERSION.txt b/cake/VERSION.txt index cf90295bd..9a5527022 100644 --- a/cake/VERSION.txt +++ b/cake/VERSION.txt @@ -17,4 +17,4 @@ // @license MIT License (http://www.opensource.org/licenses/mit-license.php) // +--------------------------------------------------------------------------------------------+ // //////////////////////////////////////////////////////////////////////////////////////////////////// -1.3.0-alpha \ No newline at end of file +1.3.0-beta \ No newline at end of file diff --git a/cake/config/config.php b/cake/config/config.php index d633f71a6..56bb88e14 100644 --- a/cake/config/config.php +++ b/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'; ?> \ No newline at end of file From ab666f8ea74a2592ce80cbe45d64e95a92fec4ae Mon Sep 17 00:00:00 2001 From: predominant Date: Sun, 17 Jan 2010 14:50:09 +1100 Subject: [PATCH 2/2] Revert "Adjusting EmailComponent Boundary creation to occur for all generated email. Fixes #14." This reverts commit b50b5922fd4fff06f5e1a93bdb4a181890d6bff0. --- cake/libs/controller/components/email.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cake/libs/controller/components/email.php b/cake/libs/controller/components/email.php index 1b13a95f8..8eb16fec4 100644 --- a/cake/libs/controller/components/email.php +++ b/cake/libs/controller/components/email.php @@ -505,8 +505,8 @@ class EmailComponent extends Object{ } } - $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';