| Index: branches/wmf-deployment/includes/HTMLForm.php |
| — | — | @@ -717,7 +717,7 @@ |
| 718 | 718 | static $jsAdded = false; |
| 719 | 719 | |
| 720 | 720 | function __construct( $params ) { |
| 721 | | - if( !in_array( 'other', $params['options'] ) ) { |
| | 721 | + if( !in_array( 'other', $params['options'], true ) ) { |
| 722 | 722 | $params['options'][wfMsg( 'htmlform-selectorother-other' )] = 'other'; |
| 723 | 723 | } |
| 724 | 724 | |
| — | — | @@ -748,7 +748,7 @@ |
| 749 | 749 | |
| 750 | 750 | $select->setAttribute( 'class', 'mw-htmlform-select-or-other' ); |
| 751 | 751 | |
| 752 | | - $tbAttribs = array( 'id' => $this->mID . '-other' ); |
| | 752 | + $tbAttribs = array( 'id' => $this->mID . '-other', 'size' => $this->getSize() ); |
| 753 | 753 | if( !empty( $this->mParams['disabled'] ) ) { |
| 754 | 754 | $select->setAttribute( 'disabled', 'disabled' ); |
| 755 | 755 | $tbAttribs['disabled'] = 'disabled'; |
| — | — | @@ -761,8 +761,8 @@ |
| 762 | 762 | } |
| 763 | 763 | |
| 764 | 764 | $textbox = Html::input( $this->mName . '-other', |
| 765 | | - $this->getSize(), |
| 766 | | - $valInSelect ? 'text' : $value, |
| | 765 | + $valInSelect ? '' : $value, |
| | 766 | + 'text', |
| 767 | 767 | $tbAttribs ); |
| 768 | 768 | |
| 769 | 769 | return "$select<br/>\n$textbox"; |
| Property changes on: branches/wmf-deployment/includes/HTMLForm.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 770 | 770 | + /branches/REL1_15/phase3/includes/HTMLForm.php:51646 |
| /branches/wmf-deployment/includes/HTMLForm.php:53381 |
| /trunk/phase3/includes/HTMLForm.php:56184,56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350 |