aboutsummaryrefslogtreecommitdiffstats
path: root/includes/import
diff options
context:
space:
mode:
authorUmherirrender <umherirrender_de.wp@web.de>2020-03-08 22:47:14 +0100
committerUmherirrender <umherirrender_de.wp@web.de>2020-03-14 13:16:12 +0100
commit878330ae3074e5a22daba73d5fe706d8a5ebce06 (patch)
treeb109a3f12107120979685d2b8c1bc8fb9e39d06c /includes/import
parenta50432f78c6986389fb75e20fc9ce1edf1d37015 (diff)
downloadmediawikicore-878330ae3074e5a22daba73d5fe706d8a5ebce06.tar.gz
mediawikicore-878330ae3074e5a22daba73d5fe706d8a5ebce06.zip
Use MediaWikiServices::getRepoGroup
Change-Id: Ibcef425c2e0c95d6d2f98b8d889f85ebcb33f20a
Diffstat (limited to 'includes/import')
-rw-r--r--includes/import/ImportableUploadRevisionImporter.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/import/ImportableUploadRevisionImporter.php b/includes/import/ImportableUploadRevisionImporter.php
index 4be13b0a2c0f..76c7da34234b 100644
--- a/includes/import/ImportableUploadRevisionImporter.php
+++ b/includes/import/ImportableUploadRevisionImporter.php
@@ -57,19 +57,19 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
public function import( ImportableUploadRevision $importableRevision ) {
# Construct a file
$archiveName = $importableRevision->getArchiveName();
+ $localRepo = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo();
if ( $archiveName ) {
$this->logger->debug( __METHOD__ . "Importing archived file as $archiveName\n" );
$file = OldLocalFile::newFromArchiveName( $importableRevision->getTitle(),
- RepoGroup::singleton()->getLocalRepo(), $archiveName );
+ $localRepo, $archiveName );
} else {
- $file = MediaWikiServices::getInstance()->getRepoGroup()->getLocalRepo()
- ->newFile( $importableRevision->getTitle() );
+ $file = $localRepo->newFile( $importableRevision->getTitle() );
$file->load( File::READ_LATEST );
$this->logger->debug( __METHOD__ . 'Importing new file as ' . $file->getName() . "\n" );
if ( $file->exists() && $file->getTimestamp() > $importableRevision->getTimestamp() ) {
$archiveName = $importableRevision->getTimestamp() . '!' . $file->getName();
$file = OldLocalFile::newFromArchiveName( $importableRevision->getTitle(),
- RepoGroup::singleton()->getLocalRepo(), $archiveName );
+ $localRepo, $archiveName );
$this->logger->debug( __METHOD__ . "File already exists; importing as $archiveName\n" );
}
}