Title: Fix isRawHtmlMessage() for messages with underscores

[lhc/web/wiklou.git] / maintenance / convertLinks.php

diff --git a/maintenance/convertLinks.php b/maintenance/convertLinks.php
index fa9c574..af60eaa 100644 (file)
--- a/maintenance/convertLinks.php
+++ b/maintenance/convertLinks.php
@@ -21,6 +21,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/Maintenance.php';
 
 /**
@@ -75,8 +77,6 @@ class ConvertLinks extends Maintenance {
                        return;
                }
 
-               global $wgContLang;
-
                # counters etc
                $numBadLinks = $curRowsRead = 0;
 
@@ -148,12 +148,13 @@ class ConvertLinks extends Maintenance {
 
                        $dbw->bufferResults( false );
                        $res = $dbw->query( "SELECT cur_namespace,cur_title,cur_id FROM $cur" );
-                       $ids = array();
+                       $ids = [];
 
                        foreach ( $res as $row ) {
                                $title = $row->cur_title;
                                if ( $row->cur_namespace ) {
-                                       $title = $wgContLang->getNsText( $row->cur_namespace ) . ":$title";
+                                       $title = MediaWikiServices::getInstance()->getContentLanguage()->
+                                               getNsText( $row->cur_namespace ) . ":$title";
                                }
                                $ids[$title] = $row->cur_id;
                                $curRowsRead++;
@@ -193,9 +194,9 @@ class ConvertLinks extends Maintenance {
                                $sqlRead = $dbw->limitResult( $sqlRead, $linksConvInsertInterval, $rowOffset );
                                $res = $dbw->query( $sqlRead );
                                if ( $noKeys ) {
-                                       $sqlWrite = array( "INSERT INTO $links_temp (l_from,l_to) VALUES " );
+                                       $sqlWrite = [ "INSERT INTO $links_temp (l_from,l_to) VALUES " ];
                                } else {
-                                       $sqlWrite = array( "INSERT IGNORE INTO $links_temp (l_from,l_to) VALUES " );
+                                       $sqlWrite = [ "INSERT IGNORE INTO $links_temp (l_from,l_to) VALUES " ];
                                }
 
                                $tuplesAdded = 0; # no tuples added to INSERT yet
@@ -302,5 +303,5 @@ class ConvertLinks extends Maintenance {
        }
 }
 
-$maintClass = "ConvertLinks";
+$maintClass = ConvertLinks::class;
 require_once RUN_MAINTENANCE_IF_MAIN;