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 escaping of i18n message shared-repo-from"
[lhc/web/wiklou.git]
/
includes
/
htmlform
/
fields
/
HTMLSelectAndOtherField.php
diff --git
a/includes/htmlform/fields/HTMLSelectAndOtherField.php
b/includes/htmlform/fields/HTMLSelectAndOtherField.php
index
38b487a
..
cdb8f5b
100644
(file)
--- a/
includes/htmlform/fields/HTMLSelectAndOtherField.php
+++ b/
includes/htmlform/fields/HTMLSelectAndOtherField.php
@@
-72,11
+72,10
@@
class HTMLSelectAndOtherField extends HTMLSelectField {
# TextInput
$textAttribs = [
# TextInput
$textAttribs = [
- 'id' => $this->mID . '-other',
'name' => $this->mName . '-other',
'size' => $this->getSize(),
'class' => [ 'mw-htmlform-select-and-other-field' ],
'name' => $this->mName . '-other',
'size' => $this->getSize(),
'class' => [ 'mw-htmlform-select-and-other-field' ],
- 'data-id-select' => $this->mID,
+ 'data-id-select' => $this->mID
. '-select'
,
'value' => $value[2],
];
'value' => $value[2],
];
@@
-100,7
+99,7
@@
class HTMLSelectAndOtherField extends HTMLSelectField {
# DropdownInput
$dropdownInputAttribs = [
'name' => $this->mName,
# DropdownInput
$dropdownInputAttribs = [
'name' => $this->mName,
- 'id' => $this->mID,
+ 'id' => $this->mID
. '-select'
,
'options' => $this->getOptionsOOUI(),
'value' => $value[1],
];
'options' => $this->getOptionsOOUI(),
'value' => $value[1],
];
@@
-119,6
+118,7
@@
class HTMLSelectAndOtherField extends HTMLSelectField {
}
return $this->getInputWidget( [
}
return $this->getInputWidget( [
+ 'id' => $this->mID,
'textinput' => $textAttribs,
'dropdowninput' => $dropdownInputAttribs,
'or' => false,
'textinput' => $textAttribs,
'dropdowninput' => $dropdownInputAttribs,
'or' => false,
@@
-126,7
+126,7
@@
class HTMLSelectAndOtherField extends HTMLSelectField {
}
public function getInputWidget( $params ) {
}
public function getInputWidget( $params ) {
- return new Media
w
iki\Widget\SelectWithInputWidget( $params );
+ return new Media
W
iki\Widget\SelectWithInputWidget( $params );
}
/**
}
/**