* Allow compound interwiki prefixes in $wgImportSources

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 8c7d036..1f82dc3 100644 (file)
--- 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 aaadb66..04deb1b 100644 (file)
--- 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' : '';