dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop archive.ar_text and ar_flags
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiImport.php
diff --git
a/includes/api/ApiImport.php
b/includes/api/ApiImport.php
index
bf5e4ce
..
822711a
100644
(file)
--- a/
includes/api/ApiImport.php
+++ b/
includes/api/ApiImport.php
@@
-1,9
+1,5
@@
<?php
/**
<?php
/**
- *
- *
- * Created on Feb 4, 2009
- *
* Copyright © 2009 Roan Kattouw "<Firstname>.<Lastname>@gmail.com"
*
* This program is free software; you can redistribute it and/or modify
* Copyright © 2009 Roan Kattouw "<Firstname>.<Lastname>@gmail.com"
*
* This program is free software; you can redistribute it and/or modify
@@
-53,12
+49,18
@@
class ApiImport extends ApiBase {
$params['fullhistory'],
$params['templates']
);
$params['fullhistory'],
$params['templates']
);
+ $usernamePrefix = $params['interwikisource'];
} else {
$isUpload = true;
if ( !$user->isAllowed( 'importupload' ) ) {
$this->dieWithError( 'apierror-cantimport-upload' );
}
$source = ImportStreamSource::newFromUpload( 'xml' );
} else {
$isUpload = true;
if ( !$user->isAllowed( 'importupload' ) ) {
$this->dieWithError( 'apierror-cantimport-upload' );
}
$source = ImportStreamSource::newFromUpload( 'xml' );
+ $usernamePrefix = (string)$params['interwikiprefix'];
+ if ( $usernamePrefix === '' ) {
+ $encParamName = $this->encodeParamName( 'interwikiprefix' );
+ $this->dieWithError( [ 'apierror-missingparam', $encParamName ] );
+ }
}
if ( !$source->isOK() ) {
$this->dieStatus( $source );
}
if ( !$source->isOK() ) {
$this->dieStatus( $source );
@@
-81,6
+83,7
@@
class ApiImport extends ApiBase {
$this->dieStatus( $statusRootPage );
}
}
$this->dieStatus( $statusRootPage );
}
}
+ $importer->setUsernamePrefix( $usernamePrefix, $params['assignknownusers'] );
$reporter = new ApiImportReporter(
$importer,
$isUpload,
$reporter = new ApiImportReporter(
$importer,
$isUpload,
@@
-141,6
+144,9
@@
class ApiImport extends ApiBase {
'xml' => [
ApiBase::PARAM_TYPE => 'upload',
],
'xml' => [
ApiBase::PARAM_TYPE => 'upload',
],
+ 'interwikiprefix' => [
+ ApiBase::PARAM_TYPE => 'string',
+ ],
'interwikisource' => [
ApiBase::PARAM_TYPE => $this->getAllowedImportSources(),
],
'interwikisource' => [
ApiBase::PARAM_TYPE => $this->getAllowedImportSources(),
],
@@
-150,6
+156,7
@@
class ApiImport extends ApiBase {
'namespace' => [
ApiBase::PARAM_TYPE => 'namespace'
],
'namespace' => [
ApiBase::PARAM_TYPE => 'namespace'
],
+ 'assignknownusers' => false,
'rootpage' => null,
'tags' => [
ApiBase::PARAM_TYPE => 'tags',
'rootpage' => null,
'tags' => [
ApiBase::PARAM_TYPE => 'tags',
@@
-171,7
+178,7
@@
class ApiImport extends ApiBase {
}
public function getHelpUrls() {
}
public function getHelpUrls() {
- return 'https://www.mediawiki.org/wiki/API:Import';
+ return 'https://www.mediawiki.org/wiki/
Special:MyLanguage/
API:Import';
}
}
}
}