Updated pear/net_smtp from 1.8.0 to 1.8.1

[lhc/web/wiklou.git] / includes / editpage / TextboxBuilder.php

diff --git a/includes/editpage/TextboxBuilder.php b/includes/editpage/TextboxBuilder.php
index d0a2f8f..354cc61 100644 (file)
--- 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;
 
@@ -57,16 +58,14 @@ class TextboxBuilder {
         * @return mixed[]
         */
        public function mergeClassesIntoAttributes( array $classes, array $attribs ) {
-               if ( !count( $classes ) ) {
+               if ( $classes === [] ) {
                        return $attribs;
                }
 
-               if ( isset( $attribs['class'] ) ) {
-                       $classes[] = $attribs['class'];
-               }
-               $attribs['class'] = implode( ' ', $classes );
-
-               return $attribs;
+               return Sanitizer::mergeAttributes(
+                       $attribs,
+                       [ 'class' => implode( ' ', $classes ) ]
+               );
        }
 
        /**