dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix \n handling for HTMLUsersMultiselectField"
[lhc/web/wiklou.git]
/
includes
/
htmlform
/
fields
/
HTMLSelectOrOtherField.php
diff --git
a/includes/htmlform/fields/HTMLSelectOrOtherField.php
b/includes/htmlform/fields/HTMLSelectOrOtherField.php
index
8f7750c
..
bb41079
100644
(file)
--- a/
includes/htmlform/fields/HTMLSelectOrOtherField.php
+++ b/
includes/htmlform/fields/HTMLSelectOrOtherField.php
@@
-7,7
+7,7
@@
* and should be used instead.
*/
class HTMLSelectOrOtherField extends HTMLTextField {
* and should be used instead.
*/
class HTMLSelectOrOtherField extends HTMLTextField {
- function __construct( $params ) {
+
public
function __construct( $params ) {
parent::__construct( $params );
$this->getOptions();
if ( !in_array( 'other', $this->mOptions, true ) ) {
parent::__construct( $params );
$this->getOptions();
if ( !in_array( 'other', $this->mOptions, true ) ) {
@@
-18,10
+18,9
@@
class HTMLSelectOrOtherField extends HTMLTextField {
// Have 'other' always as first element
$this->mOptions = [ $msg => 'other' ] + $this->mOptions;
}
// Have 'other' always as first element
$this->mOptions = [ $msg => 'other' ] + $this->mOptions;
}
-
}
}
- function getInputHTML( $value ) {
+
public
function getInputHTML( $value ) {
$valInSelect = false;
if ( $value !== false ) {
$valInSelect = false;
if ( $value !== false ) {
@@
-65,7
+64,7
@@
class HTMLSelectOrOtherField extends HTMLTextField {
return "$select<br />\n$textbox";
}
return "$select<br />\n$textbox";
}
- function getInputOOUI( $value ) {
+
public
function getInputOOUI( $value ) {
return false;
}
return false;
}
@@
-74,7
+73,7
@@
class HTMLSelectOrOtherField extends HTMLTextField {
*
* @return string
*/
*
* @return string
*/
- function loadDataFromRequest( $request ) {
+
public
function loadDataFromRequest( $request ) {
if ( $request->getCheck( $this->mName ) ) {
$val = $request->getText( $this->mName );
if ( $request->getCheck( $this->mName ) ) {
$val = $request->getText( $this->mName );