From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 17 Dec 2015 09:15:42 +0100 Subject: Update to MediaWiki 1.26.0 --- includes/api/ApiImport.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'includes/api/ApiImport.php') diff --git a/includes/api/ApiImport.php b/includes/api/ApiImport.php index 2e87d22d..735cc7fa 100644 --- a/includes/api/ApiImport.php +++ b/includes/api/ApiImport.php @@ -32,9 +32,13 @@ class ApiImport extends ApiBase { public function execute() { + $this->useTransactionalTimeLimit(); + $user = $this->getUser(); $params = $this->extractRequestParams(); + $this->requireMaxOneParameter( $params, 'namespace', 'rootpage' ); + $isUpload = false; if ( isset( $params['interwikisource'] ) ) { if ( !$user->isAllowed( 'import' ) ) { @@ -63,8 +67,7 @@ class ApiImport extends ApiBase { $importer = new WikiImporter( $source->value, $this->getConfig() ); if ( isset( $params['namespace'] ) ) { $importer->setTargetNamespace( $params['namespace'] ); - } - if ( isset( $params['rootpage'] ) ) { + } elseif ( isset( $params['rootpage'] ) ) { $statusRootPage = $importer->setTargetRootPage( $params['rootpage'] ); if ( !$statusRootPage->isGood() ) { $this->dieStatus( $statusRootPage ); -- cgit v1.2.3-54-g00ecf