From: WMDE-Fisch <christoph.jauera@wikimedia.de>
Date: Fri, 5 Jan 2018 09:32:56 +0000 (+0100)
Subject: Use Sanitizer::mergeAttributes when merging classes into attributes
X-Git-Tag: 1.31.0-rc.0~948^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=85c7ac60c8a856bfaa0bb2fc3cdf78ce0f26e8e6;p=lhc%2Fweb%2Fwiklou.git

Use Sanitizer::mergeAttributes when merging classes into attributes

Change-Id: Ia5199a75e6926fe64b3d99d5b5914320491176bb
---

diff --git a/includes/editpage/TextboxBuilder.php b/includes/editpage/TextboxBuilder.php
index d0a2f8f4c3..81dc78d6d0 100644
--- a/includes/editpage/TextboxBuilder.php
+++ b/includes/editpage/TextboxBuilder.php
@@ -25,6 +25,7 @@
 namespace MediaWiki\EditPage;
 
 use MWNamespace;
+use Sanitizer;
 use Title;
 use User;
 
@@ -61,12 +62,10 @@ class TextboxBuilder {
 			return $attribs;
 		}
 
-		if ( isset( $attribs['class'] ) ) {
-			$classes[] = $attribs['class'];
-		}
-		$attribs['class'] = implode( ' ', $classes );
-
-		return $attribs;
+		return Sanitizer::mergeAttributes(
+			$attribs,
+			[ 'class' => implode( ' ', $classes ) ]
+		);
 	}
 
 	/**
diff --git a/tests/phpunit/includes/editpage/TextboxBuilderTest.php b/tests/phpunit/includes/editpage/TextboxBuilderTest.php
index b9bf5b9be7..4195f968f5 100644
--- a/tests/phpunit/includes/editpage/TextboxBuilderTest.php
+++ b/tests/phpunit/includes/editpage/TextboxBuilderTest.php
@@ -112,7 +112,12 @@ class TextboxBuilderTest extends MediaWikiTestCase {
 			[
 				[ 'mw-new-classname' ],
 				[ 'class' => 'mw-existing-classname' ],
-				[ 'class' => 'mw-new-classname mw-existing-classname' ],
+				[ 'class' => 'mw-existing-classname mw-new-classname' ],
+			],
+			[
+				[ 'mw-new-classname', 'mw-existing-classname' ],
+				[ 'class' => 'mw-existing-classname' ],
+				[ 'class' => 'mw-existing-classname mw-new-classname' ],
 			],
 		];
 	}