From 85c7ac60c8a856bfaa0bb2fc3cdf78ce0f26e8e6 Mon Sep 17 00:00:00 2001 From: WMDE-Fisch Date: Fri, 5 Jan 2018 10:32:56 +0100 Subject: [PATCH] Use Sanitizer::mergeAttributes when merging classes into attributes Change-Id: Ia5199a75e6926fe64b3d99d5b5914320491176bb --- includes/editpage/TextboxBuilder.php | 11 +++++------ .../phpunit/includes/editpage/TextboxBuilderTest.php | 7 ++++++- 2 files changed, 11 insertions(+), 7 deletions(-) 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' ], ], ]; } -- 2.20.1