Merge "Update the design of Special:Block"

[lhc/web/wiklou.git] / includes / import / ImportableUploadRevisionImporter.php

diff --git a/includes/import/ImportableUploadRevisionImporter.php b/includes/import/ImportableUploadRevisionImporter.php
index 95a171b..4b378c1 100644 (file)
--- 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(