* Allow Xml::check() $attribs parameter to override 'value' attribute

PHP's array + operator doesn't overwrite items from the left side when
keys conflict. Switch to array_merge() here, which acts as expected.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0157af6..85e66da 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -253,6 +253,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Added redirect to section feature. Use it wisely.
 * Added a configuration variable allowing the "break out of framesets" feature 
   to be switched on and off ($wgBreakFrames). Off by default.
+* Allow Xml::check() $attribs parameter to override 'value' attribute
 
 
 == Languages updated ==

diff --git a/includes/Xml.php b/includes/Xml.php
index 509ed9a..25c23ed 100644 (file)
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -128,10 +128,13 @@ class Xml {
         * @return string HTML
         */
        public static function check( $name, $checked=false, $attribs=array() ) {
-               return self::element( 'input', array(
-                       'name' => $name,
-                       'type' => 'checkbox',
-                       'value' => 1 ) + self::attrib( 'checked', $checked ) +  $attribs );
+               return self::element( 'input', array_merge(
+                       array(
+                               'name' => $name,
+                               'type' => 'checkbox',
+                               'value' => 1 ),
+                       self::attrib( 'checked', $checked ),
+                       $attribs ) );
        }
 
        /**