Merge "Fix enhanced RC data attribute sanitizing"

diff --combined includes/changes/EnhancedChangesList.php
index 2d50f76,d977457..cbbbfeb
--- 1/includes/changes/EnhancedChangesList.php
--- 2/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@@ -243,7 -243,8 +243,7 @@@ class EnhancedChangesList extends Chang
                        $text = $userlink;
                        $text .= $this->getLanguage()->getDirMark();
                        if ( $count > 1 ) {
 -                              // @todo FIXME: Hardcoded '×'. Should be a message.
 -                              $formattedCount = $this->getLanguage()->formatNum( $count ) . '×';
 +                              $formattedCount = $this->msg( 'ntimes' )->numParams( $count )->escaped();
                                $text .= ' ' . $this->msg( 'parentheses' )->rawParams( $formattedCount )->escaped();
                        }
                        array_push( $users, $text );
@@@ -685,7 -686,9 +685,9 @@@
                }
                $attribs = $data['attribs'];
                unset( $data['attribs'] );
-               $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 'isReservedDataAttribute' ] );
+               $attribs = wfArrayFilterByKey( $attribs, function( $key ) {
+                       return $key === 'class' || Sanitizer::isReservedDataAttribute( $key );
+               } );
  
                $line = Html::openElement( 'table', $attribs ) . Html::openElement( 'tr' );
                $line .= '<td class="mw-enhanced-rc"><span class="mw-enhancedchanges-arrow-space"></span>';