__selectOptions function

cakephp · Oct 30, 2010 · 6d97aed · 6d97aed
1 parent d3c1e8c
commit 6d97aed
Showing 1 changed file with 8 additions and 9 deletions.
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
@@ -1479,10 +1479,9 @@ public function select($fieldName, $options = array(), $attributes = array()) {
 
 		$select = array_merge($select, $this->__selectOptions(
 			array_reverse($options, true),
-			$attributes['value'],
 			array(),
 			$showParents,
-			array('escape' => $escapeOptions, 'style' => $style, 'name' => $attributes['name'])
+			array('escape' => $escapeOptions, 'style' => $style, 'name' => $attributes['name'], 'value' => $attributes['value'])
 		));
 
 		$template = ($style == 'checkbox') ? 'checkboxmultipleend' : 'selectend';
@@ -1963,11 +1962,11 @@ protected function _name($options = array(), $field = null, $key = 'name') {
  * @access private
  * @return array
  */
-	function __selectOptions($elements = array(), $selected = null, $parents = array(), $showParents = null, $attributes = array()) {
+	function __selectOptions($elements = array(), $parents = array(), $showParents = null, $attributes = array()) {
 		$select = array();
-		$attributes = array_merge(array('escape' => true, 'style' => null), $attributes);
+		$attributes = array_merge(array('escape' => true, 'style' => null, 'value' => null), $attributes);
-		$selectedIsEmpty = ($selected === '' || $selected === null);
+		$selectedIsEmpty = ($attributes['value'] === '' || $attributes['value'] === null);
-		$selectedIsArray = is_array($selected);
+		$selectedIsArray = is_array($attributes['value']);
 
 		foreach ($elements as $name => $title) {
 			$htmlOptions = array();
@@ -1981,7 +1980,7 @@ function __selectOptions($elements = array(), $selected = null, $parents = array
 					$parents[] = $name;
 				}
 				$select = array_merge($select, $this->__selectOptions(
-					$title, $selected, $parents, $showParents, $attributes
+					$title, $parents, $showParents, $attributes
 				));
 
 				if (!empty($name)) {
@@ -2002,8 +2001,8 @@ function __selectOptions($elements = array(), $selected = null, $parents = array
 
 			if ($name !== null) {
 				if (
-					(!$selectedIsArray && !$selectedIsEmpty && (string)$selected == (string)$name) ||
+					(!$selectedIsArray && !$selectedIsEmpty && (string)$attributes['value'] == (string)$name) ||
-					($selectedIsArray && in_array($name, $selected))
+					($selectedIsArray && in_array($name, $attributes['value']))
 				) {
 					if ($attributes['style'] === 'checkbox') {
 						$htmlOptions['checked'] = true;