diff options
Diffstat (limited to 'includes/api/ApiImport.php')
| -rw-r--r-- | includes/api/ApiImport.php | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php index 637c1fff..f48a822e 100644 --- a/includes/api/ApiImport.php +++ b/includes/api/ApiImport.php @@ -31,10 +31,6 @@ */ class ApiImport extends ApiBase { - public function __construct( $main, $action ) { - parent::__construct( $main, $action ); - } - public function execute() { $user = $this->getUser(); $params = $this->extractRequestParams(); @@ -61,7 +57,7 @@ class ApiImport extends ApiBase { $source = ImportStreamSource::newFromUpload( 'xml' ); } if ( !$source->isOK() ) { - $this->dieUsageMsg( $source->getErrorsArray() ); + $this->dieStatus( $source ); } $importer = new WikiImporter( $source->value ); @@ -70,8 +66,8 @@ class ApiImport extends ApiBase { } if ( isset( $params['rootpage'] ) ) { $statusRootPage = $importer->setTargetRootPage( $params['rootpage'] ); - if( !$statusRootPage->isGood() ) { - $this->dieUsageMsg( $statusRootPage->getErrorsArray() ); + if ( !$statusRootPage->isGood() ) { + $this->dieStatus( $statusRootPage ); } } $reporter = new ApiImportReporter( @@ -109,7 +105,9 @@ class ApiImport extends ApiBase { ApiBase::PARAM_REQUIRED => true ), 'summary' => null, - 'xml' => null, + 'xml' => array( + ApiBase::PARAM_TYPE => 'upload', + ), 'interwikisource' => array( ApiBase::PARAM_TYPE => $wgImportSources ), @@ -150,7 +148,7 @@ class ApiImport extends ApiBase { public function getDescription() { return array( - 'Import a page from another wiki, or an XML file.' , + '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.' ); @@ -186,10 +184,6 @@ class ApiImport extends ApiBase { public function getHelpUrls() { return 'https://www.mediawiki.org/wiki/API:Import'; } - - public function getVersion() { - return __CLASS__ . ': $Id$'; - } } /** |