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
Fix undefined $ok in DatabaseUpdater::migrateComments
[lhc/web/wiklou.git]
/
includes
/
htmlform
/
fields
/
HTMLSelectOrOtherField.php
diff --git
a/includes/htmlform/fields/HTMLSelectOrOtherField.php
b/includes/htmlform/fields/HTMLSelectOrOtherField.php
index
a009b28
..
fb133f2
100644
(file)
--- a/
includes/htmlform/fields/HTMLSelectOrOtherField.php
+++ b/
includes/htmlform/fields/HTMLSelectOrOtherField.php
@@
-85,7
+85,6
@@
class HTMLSelectOrOtherField extends HTMLTextField {
# DropdownInput
$dropdownAttribs = [
# DropdownInput
$dropdownAttribs = [
- 'id' => $this->mID,
'name' => $this->mName,
'options' => $this->getOptionsOOUI(),
'value' => $valInSelect ? $value : 'other',
'name' => $this->mName,
'options' => $this->getOptionsOOUI(),
'value' => $valInSelect ? $value : 'other',
@@
-103,7
+102,6
@@
class HTMLSelectOrOtherField extends HTMLTextField {
# TextInput
$textAttribs = [
# TextInput
$textAttribs = [
- 'id' => $this->mID . '-other',
'name' => $this->mName . '-other',
'size' => $this->getSize(),
'value' => $valInSelect ? '' : $value,
'name' => $this->mName . '-other',
'size' => $this->getSize(),
'value' => $valInSelect ? '' : $value,
@@
-130,6
+128,7
@@
class HTMLSelectOrOtherField extends HTMLTextField {
}
return $this->getInputWidget( [
}
return $this->getInputWidget( [
+ 'id' => $this->mID,
'textinput' => $textAttribs,
'dropdowninput' => $dropdownAttribs,
'or' => true,
'textinput' => $textAttribs,
'dropdowninput' => $dropdownAttribs,
'or' => true,
@@
-137,7
+136,7
@@
class HTMLSelectOrOtherField extends HTMLTextField {
}
public function getInputWidget( $params ) {
}
public function getInputWidget( $params ) {
- return new Media
w
iki\Widget\SelectWithInputWidget( $params );
+ return new Media
W
iki\Widget\SelectWithInputWidget( $params );
}
/**
}
/**