X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=blobdiff_plain;f=maintenance%2FimportImages.php;h=f6be840d71831a8a859d71f00782418a64027bd6;hb=45fcf5f94f7a13308665d637e2a5cd81550d1493;hp=f5d9359d43713c97c1f3b77e85a73fd3f7ff4168;hpb=b703c2408e649285bb363133b548fa1c45978a0b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index f5d9359d43..f6be840d71 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -32,10 +32,10 @@
  * @author Mij <mij@bitchx.it>
  */
 
-use MediaWiki\MediaWikiServices;
-
 require_once __DIR__ . '/Maintenance.php';
 
+use MediaWiki\MediaWikiServices;
+
 class ImportImages extends Maintenance {
 
 	public function __construct() {
@@ -127,6 +127,8 @@ class ImportImages extends Maintenance {
 	public function execute() {
 		global $wgFileExtensions, $wgUser, $wgRestrictionLevels;
 
+		$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
+
 		$processed = $added = $ignored = $skipped = $overwritten = $failed = 0;
 
 		$this->output( "Importing Files\n\n" );
@@ -213,10 +215,12 @@ class ImportImages extends Maintenance {
 
 				if ( $checkUserBlock && ( ( $processed % $checkUserBlock ) == 0 ) ) {
 					$user->clearInstanceCache( 'name' ); // reload from DB!
-					// @TODO Use PermissionManager::isBlockedFrom() instead.
-					if ( $user->getBlock() ) {
-						$this->output( $user->getName() . " was blocked! Aborting.\n" );
-						break;
+					if ( $permissionManager->isBlockedFrom( $user, $title ) ) {
+						$this->output(
+							"{$user->getName()} is blocked from {$title->getPrefixedText()}! skipping.\n"
+						);
+						$skipped++;
+						continue;
 					}
 				}