From cc0a73265af73df9eaefbc6ec6829d73ed95b973 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 25 Oct 2006 14:13:32 +0000 Subject: [PATCH] * Allow compound interwiki prefixes in $wgImportSources --- RELEASE-NOTES | 1 + includes/SpecialImport.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 8c7d03629e..1f82dc3dbc 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -89,6 +89,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * (bug 7687) Fix movetalk box checks itself when confirming a delete and move. * (bug 7684) Obey watchcreated preference for Special:Upload watch checkbox * (bug 7686) Include id attribute on delete form confirmation button +* Allow compound interwiki prefixes in $wgImportSources == Languages updated == diff --git a/includes/SpecialImport.php b/includes/SpecialImport.php index aaadb662b6..04deb1bfd3 100644 --- a/includes/SpecialImport.php +++ b/includes/SpecialImport.php @@ -845,9 +845,8 @@ class ImportStreamSource { } function newFromInterwiki( $interwiki, $page, $history=false ) { - $base = Title::getInterwikiLink( $interwiki ); $link = Title::newFromText( "$interwiki:Special:Export/$page" ); - if( empty( $base ) || empty( $link ) ) { + if( is_null( $link ) || $link->getInterwiki() == '' ) { return new WikiErrorMsg( 'importbadinterwiki' ); } else { $params = $history ? 'history=1' : ''; -- 2.20.1