From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 18 Apr 2018 17:49:29 +0000 (+0000)
Subject: Merge "installer: Clean up ext-dependency jQuery code" into REL1_31
X-Git-Tag: 1.31.0-rc.0~36
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=d4fa302db8603f63fa3b7ac5ba44d96d60127bd7;hp=05eb49e989a8e9ddda4dbfb049b6542933bc2c90;p=lhc%2Fweb%2Fwiklou.git

Merge "installer: Clean up ext-dependency jQuery code" into REL1_31
---

diff --git a/includes/import/ImportableUploadRevisionImporter.php b/includes/import/ImportableUploadRevisionImporter.php
index 495b3d60b3..b64114cf87 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" );