Fix bad archive file names in ImportableUploadRevisionImporter
authorThiemo Kreuz <thiemo.kreuz@wikimedia.de>
Mon, 16 Apr 2018 17:30:07 +0000 (19:30 +0200)
committerThiemo Kreuz <thiemo.kreuz@wikimedia.de>
Mon, 16 Apr 2018 17:30:07 +0000 (19:30 +0200)
Bug: T176871
Change-Id: I61625a515a8d49dec33af49022506be2e019a23b

includes/import/ImportableUploadRevisionImporter.php

index 495b3d6..b64114c 100644 (file)
@@ -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" );