From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 30 Jun 2017 02:21:13 +0000 (+0000)
Subject: Merge "Fix \n handling for HTMLUsersMultiselectField"
X-Git-Tag: 1.31.0-rc.0~2835
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=5049af1048c77b1ea6ab3193688d23a48ddf8df0

Merge "Fix \n handling for HTMLUsersMultiselectField"
---

5049af1048c77b1ea6ab3193688d23a48ddf8df0
diff --cc includes/htmlform/fields/HTMLUsersMultiselectField.php
index 53d1d06b23,eb88909f71..286cb8d31d
--- a/includes/htmlform/fields/HTMLUsersMultiselectField.php
+++ b/includes/htmlform/fields/HTMLUsersMultiselectField.php
@@@ -15,18 -15,16 +15,16 @@@ use MediaWiki\Widget\UsersMultiselectWi
   * @note This widget is not likely to remain functional in non-OOUI forms.
   */
  class HTMLUsersMultiselectField extends HTMLUserTextField {
- 
  	public function loadDataFromRequest( $request ) {
- 		if ( !$request->getCheck( $this->mName ) ) {
- 			return $this->getDefault();
- 		}
+ 		$value = $request->getText( $this->mName, $this->getDefault() );
  
- 		$usersArray = explode( "\n", $request->getText( $this->mName ) );
+ 		$usersArray = explode( "\n", $value );
  		// Remove empty lines
 -		$usersArray = array_values( array_filter( $usersArray, function( $username ) {
 +		$usersArray = array_values( array_filter( $usersArray, function ( $username ) {
  			return trim( $username ) !== '';
  		} ) );
- 		return $usersArray;
+ 		// This function is expected to return a string
+ 		return implode( "\n", $usersArray );
  	}
  
  	public function validate( $value, $alldata ) {