X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fimport%2FImportableUploadRevisionImporter.php;h=40c9417c11384a700c251638938a34b1948cb178;hb=3e39ec72a693cacc6bb92364fcf610de0e8c5a25;hp=4fbddb578103228837f6c56b1f1f6272fad8dc3d;hpb=d4cc4f2b4f20725725a9345c7a4b7906e5aa66d2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/import/ImportableUploadRevisionImporter.php b/includes/import/ImportableUploadRevisionImporter.php
index 4fbddb5781..40c9417c11 100644
--- a/includes/import/ImportableUploadRevisionImporter.php
+++ b/includes/import/ImportableUploadRevisionImporter.php
@@ -1,5 +1,6 @@
 <?php
 
+use MediaWiki\MediaWikiServices;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -61,7 +62,8 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 			$file = OldLocalFile::newFromArchiveName( $importableRevision->getTitle(),
 				RepoGroup::singleton()->getLocalRepo(), $archiveName );
 		} else {
-			$file = wfLocalFile( $importableRevision->getTitle() );
+			$file = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo()
+				->newFile( $importableRevision->getTitle() );
 			$file->load( File::READ_LATEST );
 			$this->logger->debug( __METHOD__ . 'Importing new file as ' . $file->getName() . "\n" );
 			if ( $file->exists() && $file->getTimestamp() > $importableRevision->getTimestamp() ) {
@@ -104,9 +106,13 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 			?: User::newFromName( $importableRevision->getUser(), false );
 
 		# Do the actual upload
-		if ( $archiveName ) {
-			$status = $file->uploadOld( $source, $archiveName,
-				$importableRevision->getTimestamp(), $importableRevision->getComment(), $user );
+		if ( $file instanceof OldLocalFile ) {
+			$status = $file->uploadOld(
+				$source,
+				$importableRevision->getTimestamp(),
+				$importableRevision->getComment(),
+				$user
+			);
 		} else {
 			$flags = 0;
 			$status = $file->upload(
@@ -155,7 +161,8 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 
 		// @todo FIXME!
 		$src = $wikiRevision->getSrc();
-		$data = Http::get( $src, [], __METHOD__ );
+		$data = MediaWikiServices::getInstance()->getHttpRequestFactory()->
+			get( $src, [], __METHOD__ );
 		if ( !$data ) {
 			$this->logger->debug( "IMPORT: couldn't fetch source $src\n" );
 			fclose( $f );