Merge "Allow partially blocked users to import images"

diff --combined maintenance/importImages.php
index 4065978,f6be840..d0d8a4b
--- 1/maintenance/importImages.php
--- 2/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@@ -32,10 -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 +127,8 @@@
        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 +215,12 @@@
  
                                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;
                                        }
                                }
  
@@@ -357,7 -361,7 +361,7 @@@
                                                # Protect the file
                                                $this->output( "\nWaiting for replica DBs...\n" );
                                                // Wait for replica DBs.
 -                                              sleep( 2.0 ); # Why this sleep?
 +                                              sleep( 2 ); # Why this sleep?
                                                wfWaitForSlaves();
  
                                                $this->output( "\nSetting image restrictions ... " );