X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FimportImages.php;h=5db1fa89c4910fa77be84b9891813273a11a6ade;hb=6fd8b71064f0d14ec3e44e20d69e60f8505ba3ba;hp=526561c1ebc9ad1d94d88f6d4907768dc0d76ae1;hpb=34e956016bb9189af091569946257e5b9b138585;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 526561c1eb..5db1fa89c4 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -299,13 +299,13 @@ class ImportImages extends Maintenance {
 						" publishing {$file} by '{$wgUser->getName()}', comment '$commentText'... "
 					);
 				} else {
-					$mwProps = new MWFileProps( MimeMagic::singleton() );
+					$mwProps = new MWFileProps( MediaWiki\MediaWikiServices::getInstance()->getMimeAnalyzer() );
 					$props = $mwProps->getPropsFromPath( $file, true );
 					$flags = 0;
 					$publishOptions = [];
 					$handler = MediaHandler::getHandler( $props['mime'] );
 					if ( $handler ) {
-						$metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] );
+						$metadata = Wikimedia\quietCall( 'unserialize', $props['metadata'] );
 
 						$publishOptions['headers'] = $handler->getContentHeaders( $metadata );
 					} else {
@@ -440,7 +440,7 @@ class ImportImages extends Maintenance {
 	/**
 	 * Split a filename into filename and extension
 	 *
-	 * @param string $filename Filename
+	 * @param string $filename
 	 * @return array
 	 */
 	private function splitFilename( $filename ) {
@@ -519,5 +519,5 @@ class ImportImages extends Maintenance {
 
 }
 
-$maintClass = 'ImportImages';
+$maintClass = ImportImages::class;
 require_once RUN_MAINTENANCE_IF_MAIN;