X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupImages.php;h=69281810e648ea88aeb1d505888ca92b46a2f774;hb=7afced64454ad30d688540f7626448ac2faefebb;hp=90364e26e23cb5e309d1fe0071ad00376e46b03c;hpb=18a6b556b3c595bd0ced99316280094e77ab4a7e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php
index 90364e26e2..69281810e6 100644
--- a/maintenance/cleanupImages.php
+++ b/maintenance/cleanupImages.php
@@ -25,6 +25,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/cleanupTable.inc';
 
 /**
@@ -40,14 +42,15 @@ class CleanupImages extends TableCleanup {
 		'callback' => 'processRow',
 	];
 
+	/** @var LocalRepo|null */
+	private $repo;
+
 	public function __construct() {
 		parent::__construct();
 		$this->addDescription( 'Script to clean up broken, unparseable upload filenames' );
 	}
 
 	protected function processRow( $row ) {
-		global $wgContLang;
-
 		$source = $row->img_name;
 		if ( $source == '' ) {
 			// Ye olde empty rows. Just kill them.
@@ -64,11 +67,13 @@ class CleanupImages extends TableCleanup {
 		// We also have some HTML entities there
 		$cleaned = Sanitizer::decodeCharReferences( $cleaned );
 
+		$contLang = MediaWikiServices::getInstance()->getContentLanguage();
+
 		// Some are old latin-1
-		$cleaned = $wgContLang->checkTitleEncoding( $cleaned );
+		$cleaned = $contLang->checkTitleEncoding( $cleaned );
 
 		// Many of remainder look like non-normalized unicode
-		$cleaned = $wgContLang->normalize( $cleaned );
+		$cleaned = $contLang->normalize( $cleaned );
 
 		$title = Title::makeTitleSafe( NS_FILE, $cleaned );
 
@@ -109,8 +114,12 @@ class CleanupImages extends TableCleanup {
 		}
 	}
 
+	/**
+	 * @param string $name
+	 * @return string
+	 */
 	private function filePath( $name ) {
-		if ( !isset( $this->repo ) ) {
+		if ( $this->repo === null ) {
 			$this->repo = RepoGroup::singleton()->getLocalRepo();
 		}