From: Marius Hoch <hoo@online.de>
Date: Fri, 28 Feb 2014 02:12:10 +0000 (+0100)
Subject: Use inContentLanguage for dropdown messages in HTMLFormField
X-Git-Tag: 1.31.0-rc.0~16793^2
X-Git-Url: https://git.cyclocoop.org/%2C?a=commitdiff_plain;h=9e66a63af83427a01d66795ac64b793ff4473218;p=lhc%2Fweb%2Fwiklou.git

Use inContentLanguage for dropdown messages in HTMLFormField

to restore b/c for now.

Bug: 61942
Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
---

diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index 27d959401c..3c4ecd0168 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -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();