X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FimportImages.php;h=b3866c13a2e38f791ade1916c68407c44824350d;hb=2b5fe6e3f1d01d8b24a1856f016c3c6d120a8855;hp=4a3d2d6bad73463b72d57962a4e5e3561575ab8a;hpb=9614ef97683e1aab4f1113527d6fe9ea1c0e68b2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/importImages.php b/maintenance/importImages.php
index 4a3d2d6bad..b3866c13a2 100644
--- a/maintenance/importImages.php
+++ b/maintenance/importImages.php
@@ -307,7 +307,9 @@ class ImportImages extends Maintenance {
 					$publishOptions = [];
 					$handler = MediaHandler::getHandler( $props['mime'] );
 					if ( $handler ) {
-						$publishOptions['headers'] = $handler->getStreamHeaders( $props['metadata'] );
+						$metadata = MediaWiki\quietCall( 'unserialize', $props['metadata'] );
+
+						$publishOptions['headers'] = $handler->getContentHeaders( $metadata );
 					} else {
 						$publishOptions['headers'] = [];
 					}
@@ -497,7 +499,7 @@ class ImportImages extends Maintenance {
 	# (preferably batching files too).
 	private function getFileCommentFromSourceWiki( $wiki_host, $file ) {
 		$url = $wiki_host . '/api.php?action=query&format=xml&titles=File:'
-			   . rawurlencode( $file ) . '&prop=imageinfo&&iiprop=comment';
+			. rawurlencode( $file ) . '&prop=imageinfo&&iiprop=comment';
 		$body = Http::get( $url, [], __METHOD__ );
 		if ( preg_match( '#<ii comment="([^"]*)" />#', $body, $matches ) == 0 ) {
 			return false;
@@ -508,7 +510,7 @@ class ImportImages extends Maintenance {
 
 	private function getFileUserFromSourceWiki( $wiki_host, $file ) {
 		$url = $wiki_host . '/api.php?action=query&format=xml&titles=File:'
-			   . rawurlencode( $file ) . '&prop=imageinfo&&iiprop=user';
+			. rawurlencode( $file ) . '&prop=imageinfo&&iiprop=user';
 		$body = Http::get( $url, [], __METHOD__ );
 		if ( preg_match( '#<ii user="([^"]*)" />#', $body, $matches ) == 0 ) {
 			return false;