X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fimport%2FImportableUploadRevisionImporter.php;h=4b378c1ec4b1008adfc7ab67053de8c1d71e6149;hb=4f4b109dcbcfd6e835390423cb69b3625985855e;hp=95a171b8a7d516894813a4570b3a68680a104b44;hpb=5123888304ecb6f7f768fba569ec86ad79b344f1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/import/ImportableUploadRevisionImporter.php b/includes/import/ImportableUploadRevisionImporter.php
index 95a171b8a7..4b378c1ec4 100644
--- a/includes/import/ImportableUploadRevisionImporter.php
+++ b/includes/import/ImportableUploadRevisionImporter.php
@@ -100,12 +100,17 @@ 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 ) {
-			$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(