X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fhtmlform%2FHTMLFormField.php;h=e6d316cbd7c800a41c2ef156617dbe807c13e3f2;hb=e3d0d0d3a1080beee67219005514900ba3dc8783;hp=27d959401c73be5425690d9ac0ed2d941b739ad2;hpb=1bebd5d785d0c05cc1c022dca2a638c5ec980389;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php index 27d959401c..e6d316cbd7 100644 --- a/includes/htmlform/HTMLFormField.php +++ b/includes/htmlform/HTMLFormField.php @@ -522,7 +522,7 @@ abstract class HTMLFormField { foreach ( $options as $key => $value ) { $key = $this->msg( $key )->plain(); $ret[$key] = is_array( $value ) - ? $this->lookupOptionsKeys($field, $value) + ? $this->lookupOptionsKeys( $value ) : strval( $value ); } return $ret; @@ -558,7 +558,7 @@ abstract class HTMLFormField { $this->mOptions = self::forceToStringRecursive( $this->mParams['options'] ); } elseif ( array_key_exists( 'options-message', $this->mParams ) ) { /** @todo This is copied from Xml::listDropDown(), deprecate/avoid duplication? */ - $message = $this->msg( $this->mParams['options-message'] )->plain(); + $message = $this->msg( $this->mParams['options-message'] )->inContentLanguage()->plain(); $optgroup = false; $this->mOptions = array();