X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fimport%2FImportableUploadRevisionImporter.php;h=515cdd5e9514723370400ced318a82cb6c568380;hp=495b3d60b3fda0d256909d7d9d25daa83ec139e2;hb=048089ae3a052deaac1003996247ce86e5a60bfc;hpb=12ff4dec05ff8bb1a1910bf6745155b93e1912b5

diff --git a/includes/import/ImportableUploadRevisionImporter.php b/includes/import/ImportableUploadRevisionImporter.php
index 495b3d60b3..515cdd5e95 100644
--- a/includes/import/ImportableUploadRevisionImporter.php
+++ b/includes/import/ImportableUploadRevisionImporter.php
@@ -50,7 +50,7 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 			$file->load( File::READ_LATEST );
 			$this->logger->debug( __METHOD__ . 'Importing new file as ' . $file->getName() . "\n" );
 			if ( $file->exists() && $file->getTimestamp() > $importableRevision->getTimestamp() ) {
-				$archiveName = $file->getTimestamp() . '!' . $file->getName();
+				$archiveName = $importableRevision->getTimestamp() . '!' . $file->getName();
 				$file = OldLocalFile::newFromArchiveName( $importableRevision->getTitle(),
 					RepoGroup::singleton()->getLocalRepo(), $archiveName );
 				$this->logger->debug( __METHOD__ . "File already exists; importing as $archiveName\n" );
@@ -85,7 +85,8 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 			return $this->newNotOkStatus();
 		}
 
-		$user = $importableRevision->getUserObj() ?: User::newFromName( $importableRevision->getUser() );
+		$user = $importableRevision->getUserObj()
+			?: User::newFromName( $importableRevision->getUser(), false );
 
 		# Do the actual upload
 		if ( $archiveName ) {