X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportImages.php;h=f27ea2feab6f630c7053bad27e1307c723575ee0;hb=b911029b3915f2c7970e1211cc54e8d0fc05b632;hp=5db1fa89c4910fa77be84b9891813273a11a6ade;hpb=967a96e7fa5910f8fc451590decb381dbfb481ba;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 5db1fa89c4..f27ea2feab 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -211,7 +211,8 @@ 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;
 					}
@@ -335,7 +336,6 @@ class ImportImages extends Maintenance {
 					$props,
 					$timestamp
 				)->isOK() ) {
-					# We're done!
 					$this->output( "done.\n" );
 
 					$doProtect = false;
@@ -419,7 +419,7 @@ class ImportImages extends Maintenance {
 				$files = [];
 				while ( ( $file = readdir( $dhl ) ) !== false ) {
 					if ( is_file( $dir . '/' . $file ) ) {
-						list( /* $name */, $ext ) = $this->splitFilename( $dir . '/' . $file );
+						$ext = pathinfo( $file, PATHINFO_EXTENSION );
 						if ( array_search( strtolower( $ext ), $exts ) !== false ) {
 							$files[] = $dir . '/' . $file;
 						}
@@ -437,21 +437,6 @@ class ImportImages extends Maintenance {
 		}
 	}
 
-	/**
-	 * Split a filename into filename and extension
-	 *
-	 * @param string $filename
-	 * @return array
-	 */
-	private function splitFilename( $filename ) {
-		$parts = explode( '.', $filename );
-		$ext = $parts[count( $parts ) - 1];
-		unset( $parts[count( $parts ) - 1] );
-		$fname = implode( '.', $parts );
-
-		return [ $fname, $ext ];
-	}
-
 	/**
 	 * Find an auxilliary file with the given extension, matching
 	 * the give base file path. $maxStrip determines how many extensions