From a707709e1de2b0834942a87e7cdd88c90adcdb43 Mon Sep 17 00:00:00 2001
From: ADmad <admad.coder@gmail.com>
Date: Fri, 28 Feb 2014 02:34:16 +0530
Subject: [PATCH 1/8] Added test for FormHelper::radio().

Tests generating radio input for field with model other than one used
in create(). Refs #2911.
---
 .../Test/Case/View/Helper/FormHelperTest.php  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
index 9d436133b..0786c6007 100644
--- a/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
+++ b/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -3730,6 +3730,39 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * testRadioDifferentModel
+ * Refs #2911
+ *
+ * @return void
+ */
+	public function testRadioDifferentModel() {
+		$this->Form->create('User');
+
+		$result = $this->Form->radio(
+			'Model.field',
+			array('v1' => 'option A', 'v2' => 'option B'),
+			array('label' => true, 'legend' => false, 'value' => false)
+		);
+		$expected = array(
+			array('input' => array(
+				'type' => 'radio', 'name' => 'data[Model][field]',
+				'value' => 'v1', 'id' => 'ModelFieldV1'
+			)),
+			array('label' => array('for' => 'ModelFieldV1')),
+			'option A',
+			'/label',
+			array('input' => array(
+				'type' => 'radio', 'name' => 'data[Model][field]',
+				'value' => 'v2', 'id' => 'ModelFieldV2'
+			)),
+			array('label' => array('for' => 'ModelFieldV2')),
+			'option B',
+			'/label'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * Test radio inputs with between as string or array. Also ensure
  * that an array with less between elements works.

From 45cabd40fe60c7b7d71f148d100050576328338b Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 1 Mar 2014 21:22:04 -0500
Subject: [PATCH 2/8] Update version number to 2.4.6

---
 lib/Cake/VERSION.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Cake/VERSION.txt b/lib/Cake/VERSION.txt
index 22bb0e90a..268820d46 100644
--- a/lib/Cake/VERSION.txt
+++ b/lib/Cake/VERSION.txt
@@ -17,4 +17,4 @@
 // @license       http://www.opensource.org/licenses/mit-license.php MIT License
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-2.4.5
+2.4.6

From a17345cb92cf164afdca1ec129513302851938cb Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sat, 1 Mar 2014 21:32:36 -0500
Subject: [PATCH 3/8] Update build.xml file so PEAR packages include Fixtures.

---
 build.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/build.xml b/build.xml
index 82ee704d7..42ed084bd 100644
--- a/build.xml
+++ b/build.xml
@@ -29,7 +29,9 @@
 		<exclude name="Console/cake.bat" />
 		<exclude name="Console/cake.php" />
 		<exclude name="Console/cake" />
-		<exclude name="Test/**" />
+		<exclude name="Test/bake_compare/**" />
+		<exclude name="Test/Case/**" />
+		<exclude name="Test/test_app/**" />
 	</fileset>
 
 	<!--

From 7ab028e9d7f55c322a03bcab45c18ce698d62356 Mon Sep 17 00:00:00 2001
From: Marlin Cremers <m.cremers@mms-projects.net>
Date: Sun, 2 Mar 2014 10:40:39 +0100
Subject: [PATCH 4/8] Added the Limburgish language

---
 lib/Cake/I18n/L10n.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/Cake/I18n/L10n.php b/lib/Cake/I18n/L10n.php
index dbd83b16d..acf2065ad 100644
--- a/lib/Cake/I18n/L10n.php
+++ b/lib/Cake/I18n/L10n.php
@@ -136,6 +136,7 @@ class L10n {
 		/* Korean */ 'kor' => 'ko',
 		/* Latvian */ 'lav' => 'lv',
 		/* Lithuanian */ 'lit' => 'lt',
+		/* Limburgish */ 'lim' => 'li',
 		/* Macedonian */ 'mkd' => 'mk',
 		/* Macedonian - bibliographic */ 'mac' => 'mk',
 		/* Malaysian */ 'msa' => 'ms',
@@ -278,6 +279,7 @@ class L10n {
 		'ko-kr' => array('language' => 'Korea (South)', 'locale' => 'ko_kr', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
 		'koi8-r' => array('language' => 'Russian', 'locale' => 'koi8_r', 'localeFallback' => 'rus', 'charset' => 'koi8-r', 'direction' => 'ltr'),
 		'lt' => array('language' => 'Lithuanian', 'locale' => 'lit', 'localeFallback' => 'lit', 'charset' => 'utf-8', 'direction' => 'ltr'),
+		'li' => array('language' => 'Limburgish', 'locale' => 'lim', 'localeFallback' => 'nld', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'lv' => array('language' => 'Latvian', 'locale' => 'lav', 'localeFallback' => 'lav', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'mk' => array('language' => 'FYRO Macedonian', 'locale' => 'mkd', 'localeFallback' => 'mkd', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'mk-mk' => array('language' => 'Macedonian', 'locale' => 'mk_mk', 'localeFallback' => 'mkd', 'charset' => 'utf-8', 'direction' => 'ltr'),

From 579511139177d4d4066a9bb07d4b2e278b11e8f2 Mon Sep 17 00:00:00 2001
From: Marlin Cremers <m.cremers@mms-projects.net>
Date: Sun, 2 Mar 2014 14:30:26 +0100
Subject: [PATCH 5/8] Moved Limburgish to correct the order

---
 lib/Cake/I18n/L10n.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Cake/I18n/L10n.php b/lib/Cake/I18n/L10n.php
index acf2065ad..646a03440 100644
--- a/lib/Cake/I18n/L10n.php
+++ b/lib/Cake/I18n/L10n.php
@@ -135,8 +135,8 @@ class L10n {
 		/* Kalaallisut (Greenlandic) */ 'kal' => 'kl',
 		/* Korean */ 'kor' => 'ko',
 		/* Latvian */ 'lav' => 'lv',
-		/* Lithuanian */ 'lit' => 'lt',
 		/* Limburgish */ 'lim' => 'li',
+		/* Lithuanian */ 'lit' => 'lt',
 		/* Macedonian */ 'mkd' => 'mk',
 		/* Macedonian - bibliographic */ 'mac' => 'mk',
 		/* Malaysian */ 'msa' => 'ms',
@@ -278,8 +278,8 @@ class L10n {
 		'ko-kp' => array('language' => 'Korea (North)', 'locale' => 'ko_kp', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
 		'ko-kr' => array('language' => 'Korea (South)', 'locale' => 'ko_kr', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
 		'koi8-r' => array('language' => 'Russian', 'locale' => 'koi8_r', 'localeFallback' => 'rus', 'charset' => 'koi8-r', 'direction' => 'ltr'),
-		'lt' => array('language' => 'Lithuanian', 'locale' => 'lit', 'localeFallback' => 'lit', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'li' => array('language' => 'Limburgish', 'locale' => 'lim', 'localeFallback' => 'nld', 'charset' => 'utf-8', 'direction' => 'ltr'),
+		'lt' => array('language' => 'Lithuanian', 'locale' => 'lit', 'localeFallback' => 'lit', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'lv' => array('language' => 'Latvian', 'locale' => 'lav', 'localeFallback' => 'lav', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'mk' => array('language' => 'FYRO Macedonian', 'locale' => 'mkd', 'localeFallback' => 'mkd', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'mk-mk' => array('language' => 'Macedonian', 'locale' => 'mk_mk', 'localeFallback' => 'mkd', 'charset' => 'utf-8', 'direction' => 'ltr'),

From 316def45cbe615117d7b014e91b6786d15a7138a Mon Sep 17 00:00:00 2001
From: James Michael DuPont <jamesmikedupont@gmail.com>
Date: Sat, 1 Mar 2014 21:39:42 -0600
Subject: [PATCH 6/8] adding in simple doc for db_acl

---
 app/Config/Schema/db_acl.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/Config/Schema/db_acl.php b/app/Config/Schema/db_acl.php
index 495055bf3..91d93e084 100644
--- a/app/Config/Schema/db_acl.php
+++ b/app/Config/Schema/db_acl.php
@@ -33,6 +33,9 @@ class DbAclSchema extends CakeSchema {
 	public function after($event = array()) {
 	}
 
+/**
+ * ACO - Access Control Object - Something that is wanted
+ */
 	public $acos = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
@@ -44,6 +47,9 @@ class DbAclSchema extends CakeSchema {
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
 	);
 
+/**
+ * ARO - Access Request Object - Something that wants something
+ */
 	public $aros = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'parent_id' => array('type' => 'integer', 'null' => true, 'default' => null, 'length' => 10),
@@ -55,6 +61,10 @@ class DbAclSchema extends CakeSchema {
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1))
 	);
 
+/**
+ * Used by the Cake::Model:Permission class.
+ * Checks if the given $aro has access to action $action in $aco.
+ */
 	public $aros_acos = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => null, 'length' => 10, 'key' => 'primary'),
 		'aro_id' => array('type' => 'integer', 'null' => false, 'length' => 10, 'key' => 'index'),

From 549908738b9259484f4c90f347a8020a3d4e2063 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Sun, 2 Mar 2014 21:07:25 -0500
Subject: [PATCH 7/8] Include the last error if available when sending with
 mail() fails.

When sending email using mail() include the last error if available.

Fixes #2910
---
 lib/Cake/Network/Email/MailTransport.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Cake/Network/Email/MailTransport.php b/lib/Cake/Network/Email/MailTransport.php
index d72cede7e..692ca06fe 100644
--- a/lib/Cake/Network/Email/MailTransport.php
+++ b/lib/Cake/Network/Email/MailTransport.php
@@ -67,11 +67,15 @@ class MailTransport extends AbstractTransport {
 		if (ini_get('safe_mode')) {
 			//@codingStandardsIgnoreStart
 			if (!@mail($to, $subject, $message, $headers)) {
-				throw new SocketException(__d('cake_dev', 'Could not send email.'));
+				$error = error_get_last();
+				$msg = 'Could not send email: ' . isset($error['message']) ? $error['message'] : 'unknown';
+				throw new SocketException($msg);
 			}
 		} elseif (!@mail($to, $subject, $message, $headers, $params)) {
+			$error = error_get_last();
+			$msg = 'Could not send email: ' . isset($error['message']) ? $error['message'] : 'unknown';
 			//@codingStandardsIgnoreEnd
-			throw new SocketException(__d('cake_dev', 'Could not send email.'));
+			throw new SocketException($msg);
 		}
 	}
 

From 003d1a6d4792d16dfa08885505befe74c3b2fb03 Mon Sep 17 00:00:00 2001
From: Bryan Crowe <bryan@bryan-crowe.com>
Date: Mon, 3 Mar 2014 01:03:56 -0500
Subject: [PATCH 8/8] Add missing semi-colon, fixes #2937

---
 app/Config/core.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Config/core.php b/app/Config/core.php
index 17758d18a..ea73f4eab 100644
--- a/app/Config/core.php
+++ b/app/Config/core.php
@@ -275,7 +275,7 @@
  * then the value of `Config.timezone` will be used. This feature allows you to set users' timezone just
  * once instead of passing it each time in function calls.
  */
-	//Configure::write('Config.timezone', 'Europe/Paris')
+	//Configure::write('Config.timezone', 'Europe/Paris');
 
 /**
  *