Allow gender based localisation for 'lastmodifiedatby'

[lhc/web/wiklou.git] / includes / HTMLForm.php

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index b41dc4b..f77ff4c 100644 (file)
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -581,7 +581,7 @@ class HTMLSelectOrOtherField extends HTMLTextField {
        
        function __construct( $params ) {
                if (! array_key_exists('other', $params['options']) ) {
-                       $params['options']['other'] = wfMsg( 'htmlform-selectorother-other' );
+                       $params['options'][wfMsg( 'htmlform-selectorother-other' )] = 'other';
                }
                
                parent::__construct( $params );
@@ -664,8 +664,8 @@ class HTMLMultiSelectField extends HTMLFormField {
                                $html .= $this->formatOptions( $info, $value );
                        } else {
                                $checkbox = Xml::check( $this->mName.'[]', in_array( $info, $value ),
-                                                               array( 'id' => $this->mID, 'value' => $info ) );
-                               $checkbox .= ' ' . Xml::tags( 'label', array( 'for' => $this->mID ), $label );
+                                                               array( 'id' => $this->mID."-$info", 'value' => $info ) );
+                               $checkbox .= ' ' . Xml::tags( 'label', array( 'for' => $this->mID."-$info" ), $label );
                                
                                $html .= Xml::tags( 'p', null, $checkbox );
                        }