From: Robin Pepermans <robin@users.mediawiki.org>
Date: Sat, 9 Jul 2011 19:33:58 +0000 (+0000)
Subject: Allow the 'other' parameter for HTMLForm selectorother: it is used in SpecialBlock... 
X-Git-Tag: 1.31.0-rc.0~28960
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=a3630dcbdd02c95900f17ec8acc9c2ca051ce50d;p=lhc%2Fweb%2Fwiklou.git

Allow the 'other' parameter for HTMLForm selectorother: it is used in SpecialBlock.php::getFormFields() (and maybe in more files)
---

diff --git a/includes/HTMLForm.php b/includes/HTMLForm.php
index c73d536185..ffa1f4b9ce 100644
--- a/includes/HTMLForm.php
+++ b/includes/HTMLForm.php
@@ -1375,7 +1375,8 @@ class HTMLSelectOrOtherField extends HTMLTextField {
 
 	function __construct( $params ) {
 		if ( !in_array( 'other', $params['options'], true ) ) {
-			$params['options'][wfMsg( 'htmlform-selectorother-other' )] = 'other';
+			$msg = $params['other'] ? $params['other'] : wfMsg( 'htmlform-selectorother-other' );
+			$params['options'][$msg] = 'other';
 		}
 
 		parent::__construct( $params );