jenkins-bot has submitted this change and it was merged.
Change subject: Use inContentLanguage for dropdown messages in HTMLFormField
......................................................................
Use inContentLanguage for dropdown messages in HTMLFormField
to restore b/c for now.
Bug: 61942
Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
(cherry picked from commit 9e66a63af83427a01d66795ac64b793ff4473218)
---
M includes/htmlform/HTMLFormField.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Anomie: Looks good to me, but someone else must approve
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/htmlform/HTMLFormField.php
b/includes/htmlform/HTMLFormField.php
index 27d9594..3c4ecd0 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -558,7 +558,7 @@
$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();
--
To view, visit https://gerrit.wikimedia.org/r/116095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2741ef940d83eeb564e89e20378fb4004cfe5b83
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.23wmf15
Gerrit-Owner: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Anomie <bjor...@wikimedia.org>
Gerrit-Reviewer: Greg Grossmeier <g...@wikimedia.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
