Merge "Warn if stateful ParserOutput transforms are used"

[lhc/web/wiklou.git] / includes / htmlform / fields / HTMLUsersMultiselectField.php

diff --git a/includes/htmlform/fields/HTMLUsersMultiselectField.php b/includes/htmlform/fields/HTMLUsersMultiselectField.php
index 286cb8d..46cc6d3 100644 (file)
--- a/includes/htmlform/fields/HTMLUsersMultiselectField.php
+++ b/includes/htmlform/fields/HTMLUsersMultiselectField.php
@@ -56,6 +56,14 @@ class HTMLUsersMultiselectField extends HTMLUserTextField {
        public function getInputOOUI( $value ) {
                $params = [ 'name' => $this->mName ];
 
+               if ( isset( $this->mParams['id'] ) ) {
+                       $params['id'] = $this->mParams['id'];
+               }
+
+               if ( isset( $this->mParams['disabled'] ) ) {
+                       $params['disabled'] = $this->mParams['disabled'];
+               }
+
                if ( isset( $this->mParams['default'] ) ) {
                        $params['default'] = $this->mParams['default'];
                }
@@ -63,14 +71,12 @@ class HTMLUsersMultiselectField extends HTMLUserTextField {
                if ( isset( $this->mParams['placeholder'] ) ) {
                        $params['placeholder'] = $this->mParams['placeholder'];
                } else {
-                       $params['placeholder'] = $this->msg( 'mw-widgets-usersmultiselect-placeholder' )
-                                                       ->inContentLanguage()
-                                                       ->plain();
+                       $params['placeholder'] = $this->msg( 'mw-widgets-usersmultiselect-placeholder' )->plain();
                }
 
                if ( !is_null( $value ) ) {
                        // $value is a string, but the widget expects an array
-                       $params['default'] = explode( "\n", $value );
+                       $params['default'] = $value === '' ? [] : explode( "\n", $value );
                }
 
                // Make the field auto-infusable when it's used inside a legacy HTMLForm rather than OOUIHTMLForm