Merge "phpunit: Don't bother resetting unused global in UploadFromUrlTestSuite"

[lhc/web/wiklou.git] / includes / changes / OldChangesList.php

diff --git a/includes/changes/OldChangesList.php b/includes/changes/OldChangesList.php
index 7ba12fb..c15701b 100644 (file)
--- a/includes/changes/OldChangesList.php
+++ b/includes/changes/OldChangesList.php
@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 class OldChangesList extends ChangesList {
 
        /**
@@ -58,7 +60,10 @@ class OldChangesList extends ChangesList {
                ) {
                        return false;
                }
-               $attribs = wfArrayFilterByKey( $attribs, [ Sanitizer::class, 'isReservedDataAttribute' ] );
+               $attribs = array_filter( $attribs,
+                       [ Sanitizer::class, 'isReservedDataAttribute' ],
+                       ARRAY_FILTER_USE_KEY
+               );
 
                $dateheader = ''; // $html now contains only <li>...</li>, for hooks' convenience.
                $this->insertDateHeader( $dateheader, $rc->mAttribs['rc_timestamp'] );
@@ -90,7 +95,8 @@ class OldChangesList extends ChangesList {
                        }
                // Log entries (old format) or log targets, and special pages
                } elseif ( $rc->mAttribs['rc_namespace'] == NS_SPECIAL ) {
-                       list( $name, $htmlubpage ) = SpecialPageFactory::resolveAlias( $rc->mAttribs['rc_title'] );
+                       list( $name, $htmlubpage ) = MediaWikiServices::getInstance()->getSpecialPageFactory()->
+                               resolveAlias( $rc->mAttribs['rc_title'] );
                        if ( $name == 'Log' ) {
                                $this->insertLog( $html, $rc->getTitle(), $htmlubpage );
                        }
@@ -115,7 +121,7 @@ class OldChangesList extends ChangesList {
                if ( $this->getConfig()->get( 'RCShowChangedSize' ) ) {
                        $cd = $this->formatCharacterDifference( $rc );
                        if ( $cd !== '' ) {
-                               $html .= $cd . '  <span class="mw-changeslist-separator">. .</span> ';
+                               $html .= $cd . '  <span class="mw-changeslist-separator"></span> ';
                        }
                }