r52070 breaks the use of optgroups etc: array(...) is cast to 'Array'. Need to only cast integers to strings.

1 files changed, 4 insertions, 1 deletions

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index 0952ebf6afe0..fbb17d4b44f8 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1222,7 +1222,10 @@ class HTMLSelectField extends HTMLFormField {
 		# If one of the options' 'name' is int(0), it is automatically selected.
 		# because PHP sucks and things int(0) == 'some string'.
 		# Working around this by forcing all of them to strings.
-		$options = array_map( 'strval', $this->mParams['options'] );
+		$options = array_map( 
+			create_function('$opt', 'return is_int($opt) ? strval($opt) : $opt;'),
+			$this->mParams['options'] 
+		);
 
 		if ( !empty( $this->mParams['disabled'] ) ) {
 			$select->setAttribute( 'disabled', 'disabled' );