Fixing php4 compatibility and errors from array to string conversion.

cakephp · Jan 26, 2010 · 9cbb9d1 · 9cbb9d1
1 parent 16eaa99
commit 9cbb9d1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
@@ -1721,7 +1721,10 @@ function __selectOptions($elements = array(), $selected = null, $parents = array
 			}
 
 			if ($name !== null) {
-				if ((!$selectedIsEmpty && (string)$selected == (string)$name) || ($selectedIsArray && in_array($name, $selected))) {
+				if (
+					(!$selectedIsArray && !$selectedIsEmpty && (string)$selected == (string)$name) || 
+					($selectedIsArray && in_array($name, $selected))
+				) {
 					if ($attributes['style'] === 'checkbox') {
 						$htmlOptions['checked'] = true;
 					} else {