Merge "Import.php: Use Config instead of globals"

diff --combined includes/api/ApiImport.php
index b2febde,12b36f3..a134074
--- 1/includes/api/ApiImport.php
--- 2/includes/api/ApiImport.php
+++ b/includes/api/ApiImport.php
@@@ -60,7 -60,7 +60,7 @@@ class ApiImport extends ApiBase 
                        $this->dieStatus( $source );
                }
  
-               $importer = new WikiImporter( $source->value );
+               $importer = new WikiImporter( $source->value, $this->getConfig() );
                if ( isset( $params['namespace'] ) ) {
                        $importer->setTargetNamespace( $params['namespace'] );
                }
@@@ -116,15 -116,36 +116,15 @@@
                );
        }
  
 -      public function getParamDescription() {
 -              return array(
 -                      'summary' => 'Import summary',
 -                      'xml' => 'Uploaded XML file',
 -                      'interwikisource' => 'For interwiki imports: wiki to import from',
 -                      'interwikipage' => 'For interwiki imports: page to import',
 -                      'fullhistory' => 'For interwiki imports: import the full history, not just the current version',
 -                      'templates' => 'For interwiki imports: import all included templates as well',
 -                      'namespace' => 'For interwiki imports: import to this namespace',
 -                      'rootpage' => 'Import as subpage of this page',
 -              );
 -      }
 -
 -      public function getDescription() {
 -              return array(
 -                      'Import a page from another wiki, or an XML file.',
 -                      'Note that the HTTP POST must be done as a file upload (i.e. using multipart/form-data) when',
 -                      'sending a file for the "xml" parameter.'
 -              );
 -      }
 -
        public function needsToken() {
                return 'csrf';
        }
  
 -      public function getExamples() {
 +      protected function getExamplesMessages() {
                return array(
 -                      'api.php?action=import&interwikisource=meta&interwikipage=Help:ParserFunctions&' .
 +                      'action=import&interwikisource=meta&interwikipage=Help:ParserFunctions&' .
                                'namespace=100&fullhistory=&token=123ABC'
 -                              => 'Import [[meta:Help:Parserfunctions]] to namespace 100 with full history',
 +                              => 'apihelp-import-example-import',
                );
        }
  

diff --combined includes/specials/SpecialImport.php
index 05bb607,2bdb227..0831c20
--- 1/includes/specials/SpecialImport.php
--- 2/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@@ -157,7 -157,7 +157,7 @@@ class SpecialImport extends SpecialPag
                                array( 'importfailed', $source->getWikiText() )
                        );
                } else {
-                       $importer = new WikiImporter( $source->value );
+                       $importer = new WikiImporter( $source->value, $this->getConfig() );
                        if ( !is_null( $this->namespace ) ) {
                                $importer->setTargetNamespace( $this->namespace );
                        }
@@@ -251,7 -251,7 +251,7 @@@
                                        Xml::label( $this->msg( 'import-comment' )->text(), 'mw-import-comment' ) .
                                        "</td>
                                        <td class='mw-input'>" .
 -                                      Xml::input( 'log-comment', 50, 
 +                                      Xml::input( 'log-comment', 50,
                                                ( $this->sourceName == 'upload' ? $this->logcomment : '' ),
                                                array( 'id' => 'mw-import-comment', 'type' => 'text' ) ) . ' ' .
                                        "</td>