X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fimport%2FImportStreamSource.php;h=94a2b937e0ec562952864ea82492f1e5e31f4d22;hp=0c12ebb60f8f0f67f6e161653010518adc879fc7;hb=956c2430c7b8fceb289aaeacc8d6c2e0def2c56e;hpb=ad26f9e92ab598cfb2b8446656d031b8778b1048 diff --git a/includes/import/ImportStreamSource.php b/includes/import/ImportStreamSource.php index 0c12ebb60f..94a2b937e0 100644 --- a/includes/import/ImportStreamSource.php +++ b/includes/import/ImportStreamSource.php @@ -23,6 +23,7 @@ * @file * @ingroup SpecialPage */ +use MediaWiki\MediaWikiServices; /** * Imports a XML dump from a file (either from file upload, files on disk, or HTTP) @@ -92,7 +93,7 @@ class ImportStreamSource implements ImportSource { } $fname = $upload['tmp_name']; if ( is_uploaded_file( $fname ) ) { - return ImportStreamSource::newFromFile( $fname ); + return self::newFromFile( $fname ); } else { return Status::newFatal( 'importnofile' ); } @@ -148,7 +149,8 @@ class ImportStreamSource implements ImportSource { # Look up the first interwiki prefix, and let the foreign site handle # subsequent interwiki prefixes $firstIwPrefix = strtok( $interwiki, ':' ); - $firstIw = Interwiki::fetch( $firstIwPrefix ); + $interwikiLookup = MediaWikiServices::getInstance()->getInterwikiLookup(); + $firstIw = $interwikiLookup->fetch( $firstIwPrefix ); if ( !$firstIw ) { return Status::newFatal( 'importbadinterwiki' ); } @@ -176,6 +178,6 @@ class ImportStreamSource implements ImportSource { $url = wfAppendQuery( $link, $params ); # For interwikis, use POST to avoid redirects. - return ImportStreamSource::newFromURL( $url, "POST" ); + return self::newFromURL( $url, "POST" ); } }