FormHelper: Allow a boolean value for the disabled attribute in function radio

app/Config/Schema/db_acl.sql

@@ -0,0 +1,40 @@
+# $Id$
+#
+# Copyright 2005-2011, Cake Software Foundation, Inc.
+#
+# Licensed under The MIT License
+# Redistributions of files must retain the above copyright notice.
+# MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+CREATE TABLE acos (
+  id INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  parent_id INTEGER(10) DEFAULT NULL,
+  model VARCHAR(255) DEFAULT '',
+  foreign_key INTEGER(10) UNSIGNED DEFAULT NULL,
+  alias VARCHAR(255) DEFAULT '',
+  lft INTEGER(10) DEFAULT NULL,
+  rght INTEGER(10) DEFAULT NULL,
+  PRIMARY KEY  (id)
+);
+
+CREATE TABLE aros_acos (
+  id INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  aro_id INTEGER(10) UNSIGNED NOT NULL,
+  aco_id INTEGER(10) UNSIGNED NOT NULL,
+  _create CHAR(2) NOT NULL DEFAULT 0,
+  _read CHAR(2) NOT NULL DEFAULT 0,
+  _update CHAR(2) NOT NULL DEFAULT 0,
+  _delete CHAR(2) NOT NULL DEFAULT 0,
+  PRIMARY KEY(id)
+);
+
+CREATE TABLE aros (
+  id INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT,
+  parent_id INTEGER(10) DEFAULT NULL,
+  model VARCHAR(255) DEFAULT '',
+  foreign_key INTEGER(10) UNSIGNED DEFAULT NULL,
+  alias VARCHAR(255) DEFAULT '',
+  lft INTEGER(10) DEFAULT NULL,
+  rght INTEGER(10) DEFAULT NULL,
+  PRIMARY KEY  (id)
+);

app/Config/Schema/i18n.sql

@@ -0,0 +1,26 @@
+# $Id$
+#
+# Copyright 2005-2011, Cake Software Foundation, Inc.
+#
+# Licensed under The MIT License
+# Redistributions of files must retain the above copyright notice.
+# MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+CREATE TABLE i18n (
+	id int(10) NOT NULL auto_increment,
+	locale varchar(6) NOT NULL,
+	model varchar(255) NOT NULL,
+	foreign_key int(10) NOT NULL,
+	field varchar(255) NOT NULL,
+	content mediumtext,
+	PRIMARY KEY	(id),
+#	UNIQUE INDEX I18N_LOCALE_FIELD(locale, model, foreign_key, field),
+#	INDEX I18N_LOCALE_ROW(locale, model, foreign_key),
+#	INDEX I18N_LOCALE_MODEL(locale, model),
+#	INDEX I18N_FIELD(model, foreign_key, field),
+#	INDEX I18N_ROW(model, foreign_key),
+	INDEX locale (locale),
+	INDEX model (model),
+	INDEX row_id (foreign_key),
+	INDEX field (field)
+);

app/Config/Schema/sessions.sql

@@ -0,0 +1,16 @@
+# $Id$
+#
+# Copyright 2005-2011, Cake Software Foundation, Inc.
+#								1785 E. Sahara Avenue, Suite 490-204
+#								Las Vegas, Nevada 89104
+#
+# Licensed under The MIT License
+# Redistributions of files must retain the above copyright notice.
+# MIT License (http://www.opensource.org/licenses/mit-license.php)
+
+CREATE TABLE cake_sessions (
+  id varchar(255) NOT NULL default '',
+  data text,
+  expires int(11) default NULL,
+  PRIMARY KEY  (id)
+);

lib/Cake/Console/Command/Task/TestTask.php

@@ -205,12 +205,14 @@ public function getClassName($objectType) {
 			$this->out(++$key . '. ' . $option);
 			$keys[] = $key;
 		}
-		$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
-		if (isset($options[$selection - 1])) {
-			$selection = $options[$selection - 1];
-		}
-		if ($type !== 'Model') {
-			$selection = substr($selection, 0, $typeLength * - 1);
+		while (empty($selection)) {
+			$selection = $this->in(__d('cake_console', 'Choose an existing class, or enter the name of a class that does not exist'));
+			if (is_numeric($selection) && isset($options[$selection - 1])) {
+				$selection = $options[$selection - 1];
+			}
+			if ($type !== 'Model') {
+				$selection = substr($selection, 0, $typeLength * - 1);
+			}
 		}
 		return $selection;
 	}

lib/Cake/Controller/Component/AuthComponent.php

@@ -337,8 +337,7 @@ public function startup($controller) {
 	}
 
 /**
- * Attempts to introspect the correct values for object properties including
- * $userModel and $sessionKey.
+ * Attempts to introspect the correct values for object properties.
  *
  * @return boolean
  */

lib/Cake/Controller/Component/PaginatorComponent.php

@@ -353,7 +353,7 @@ public function validateSort($object, $options, $whitelist = array()) {
 					$order[$alias . '.' . $field] = $value;
 				} elseif ($object->hasField($key, true)) {
 					$order[$field] = $value;
-				} elseif (isset($object->{$alias}) && $object->{$alias}->hasField($field)) {
+				} elseif (isset($object->{$alias}) && $object->{$alias}->hasField($field, true)) {
 					$order[$alias . '.' . $field] = $value;
 				}
 			}

lib/Cake/Controller/Component/RequestHandlerComponent.php

@@ -139,9 +139,9 @@ protected function _setExtension() {
 		}
 		$extensions = Router::extensions();
 		$preferred = array_shift($accept);
-		$preferredTypes = $this->mapType($preferred);
+		$preferredTypes = $this->response->mapType($preferred);
 		$similarTypes = array_intersect($extensions, $preferredTypes);
-		if (count($similarTypes) === 1 && !in_array('html', $preferredTypes)) {
+		if (count($similarTypes) === 1 && !in_array('xhtml', $preferredTypes) && !in_array('html', $preferredTypes)) {
 			$this->ext = array_shift($similarTypes);
 		}
 	}

lib/Cake/Controller/Component/SecurityComponent.php

@@ -208,6 +208,9 @@ public function startup($controller) {
 			}
 		}
 		$this->_generateToken($controller);
+		if ($isPost) {
+			unset($controller->request->data['_Token']);
+		}
 	}
 
 /**

lib/Cake/Model/Datasource/DboSource.php

@@ -2590,6 +2590,10 @@ public function order($keys, $direction = 'ASC', $model = null) {
 			if (is_object($model) && $model->isVirtualField($key)) {
 				$key =  '(' . $this->_quoteFields($model->getVirtualField($key)) . ')';
 			}
+			list($alias, $field) = pluginSplit($key);
+			if (is_object($model) && $alias !== $model->alias && is_object($model->{$alias}) && $model->{$alias}->isVirtualField($key)) {
+				$key =  '(' . $this->_quoteFields($model->{$alias}->getVirtualField($key)) . ')';
+			}
 
 			if (strpos($key, '.')) {
 				$key = preg_replace_callback('/([a-zA-Z0-9_-]{1,})\\.([a-zA-Z0-9_-]{1,})/', array(&$this, '_quoteMatchedField'), $key);

lib/Cake/Network/CakeRequest.php

@@ -413,6 +413,17 @@ public function __get($name) {
 		return null;
 	}
 
+/**
+ * Magic isset method allows isset/empty checks
+ * on routing parameters.
+ *
+ * @param string $name The property being accessed.
+ * @return bool Existence
+ */
+	public function __isset($name) {
+		return isset($this->params[$name]);
+	}
+
 /**
  * Check whether or not a Request is a certain type.  Uses the built in detection rules
  * as well as additional rules defined with CakeRequest::addDetector().  Any detector can be called

lib/Cake/Network/Email/CakeEmail.php

@@ -546,9 +546,9 @@ protected function _addEmail($varName, $email, $name) {
 	}
 
 /**
- * Set Subject
+ * Get/Set Subject.
  *
- * @param string $subject
+ * @param null|string $subject
  * @return mixed
  */
 	public function subject($subject = null) {

lib/Cake/Network/Email/SmtpTransport.php

@@ -214,7 +214,8 @@ protected function _smtpSend($data, $checkCode = '250') {
 			if (substr($response, -2) !== "\r\n") {
 				throw new SocketException(__d('cake_dev', 'SMTP timeout.'));
 			}
-			$response = end(explode("\r\n", rtrim($response, "\r\n")));
+			$responseLines = explode("\r\n", rtrim($response, "\r\n"));
+			$response = end($responseLines);
 
 			if (preg_match('/^(' . $checkCode . ')(.)/', $response, $code)) {
 				if ($code[2] === '-') {