X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=maintenance%2FimportImages.php;h=f5d9359d43713c97c1f3b77e85a73fd3f7ff4168;hp=172869506b62d2e43a0cce0d0b17e3f68cfc22f5;hb=c5a731b83f35b4197454c84fd1c36264157a4952;hpb=7110e89e542f972bc148ece238829f00fb2e1053

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 172869506b..f5d9359d43 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -32,6 +32,8 @@
  * @author Mij <mij@bitchx.it>
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/Maintenance.php';
 
 class ImportImages extends Maintenance {
@@ -127,7 +129,7 @@ class ImportImages extends Maintenance {
 
 		$processed = $added = $ignored = $skipped = $overwritten = $failed = 0;
 
-		$this->output( "Import Images\n\n" );
+		$this->output( "Importing Files\n\n" );
 
 		$dir = $this->getArg( 0 );
 
@@ -211,14 +213,16 @@ class ImportImages extends Maintenance {
 
 				if ( $checkUserBlock && ( ( $processed % $checkUserBlock ) == 0 ) ) {
 					$user->clearInstanceCache( 'name' ); // reload from DB!
-					if ( $user->isBlocked() ) {
+					// @TODO Use PermissionManager::isBlockedFrom() instead.
+					if ( $user->getBlock() ) {
 						$this->output( $user->getName() . " was blocked! Aborting.\n" );
 						break;
 					}
 				}
 
 				# Check existence
-				$image = wfLocalFile( $title );
+				$image = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo()
+					->newFile( $title );
 				if ( $image->exists() ) {
 					if ( $this->hasOption( 'overwrite' ) ) {
 						$this->output( "{$base} exists, overwriting..." );
@@ -305,7 +309,7 @@ class ImportImages extends Maintenance {
 					$publishOptions = [];
 					$handler = MediaHandler::getHandler( $props['mime'] );
 					if ( $handler ) {
-						$metadata = Wikimedia\quietCall( 'unserialize', $props['metadata'] );
+						$metadata = \Wikimedia\AtEase\AtEase::quietCall( 'unserialize', $props['metadata'] );
 
 						$publishOptions['headers'] = $handler->getContentHeaders( $metadata );
 					} else {