Merge "Remove incorrect timezone conversion from date parameters"

[lhc/web/wiklou.git] / includes / specialpage / PageQueryPage.php

diff --git a/includes/specialpage/PageQueryPage.php b/includes/specialpage/PageQueryPage.php
index f7f0499..ad66e31 100644 (file)
--- a/includes/specialpage/PageQueryPage.php
+++ b/includes/specialpage/PageQueryPage.php
@@ -21,7 +21,8 @@
  * @ingroup SpecialPage
  */
 
-use Wikimedia\Rdbms\ResultWrapper;
+use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\IResultWrapper;
 use Wikimedia\Rdbms\IDatabase;
 
 /**
@@ -36,7 +37,7 @@ abstract class PageQueryPage extends QueryPage {
         * This should be done for live data and cached data.
         *
         * @param IDatabase $db
-        * @param ResultWrapper $res
+        * @param IResultWrapper $res
         */
        public function preprocessResults( $db, $res ) {
                $this->executeLBFromResultWrapper( $res );
@@ -50,12 +51,11 @@ abstract class PageQueryPage extends QueryPage {
         * @return string
         */
        public function formatResult( $skin, $row ) {
-               global $wgContLang;
-
                $title = Title::makeTitleSafe( $row->namespace, $row->title );
 
                if ( $title instanceof Title ) {
-                       $text = $wgContLang->convert( $title->getPrefixedText() );
+                       $text = MediaWikiServices::getInstance()->getContentLanguage()->
+                               convert( $title->getPrefixedText() );
                        return $this->getLinkRenderer()->makeLink( $title, $text );
                } else {
                        return Html::element( 'span', [ 'class' => 'mw-invalidtitle' ],