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
Merge "RC/Watchlist: Filter out parameters that cannot be displayed"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiImport.php
diff --git
a/includes/api/ApiImport.php
b/includes/api/ApiImport.php
index
10106ff
..
3f48f38
100644
(file)
--- a/
includes/api/ApiImport.php
+++ b/
includes/api/ApiImport.php
@@
-42,10
+42,10
@@
class ApiImport extends ApiBase {
$isUpload = false;
if ( isset( $params['interwikisource'] ) ) {
if ( !$user->isAllowed( 'import' ) ) {
$isUpload = false;
if ( isset( $params['interwikisource'] ) ) {
if ( !$user->isAllowed( 'import' ) ) {
- $this->die
UsageMsg( '
cantimport' );
+ $this->die
WithError( 'apierror-
cantimport' );
}
if ( !isset( $params['interwikipage'] ) ) {
}
if ( !isset( $params['interwikipage'] ) ) {
- $this->die
UsageMsg( [ '
missingparam', 'interwikipage' ] );
+ $this->die
WithError( [ 'apierror-
missingparam', 'interwikipage' ] );
}
$source = ImportStreamSource::newFromInterwiki(
$params['interwikisource'],
}
$source = ImportStreamSource::newFromInterwiki(
$params['interwikisource'],
@@
-56,7
+56,7
@@
class ApiImport extends ApiBase {
} else {
$isUpload = true;
if ( !$user->isAllowed( 'importupload' ) ) {
} else {
$isUpload = true;
if ( !$user->isAllowed( 'importupload' ) ) {
- $this->die
UsageMsg( '
cantimport-upload' );
+ $this->die
WithError( 'apierror-
cantimport-upload' );
}
$source = ImportStreamSource::newFromUpload( 'xml' );
}
}
$source = ImportStreamSource::newFromUpload( 'xml' );
}
@@
-83,7
+83,7
@@
class ApiImport extends ApiBase {
try {
$importer->doImport();
} catch ( Exception $e ) {
try {
$importer->doImport();
} catch ( Exception $e ) {
- $this->die
UsageMsg( [ 'import-unknownerror', $e->getMessage(
) ] );
+ $this->die
WithError( [ 'apierror-import-unknownerror', wfEscapeWikiText( $e->getMessage()
) ] );
}
$resultData = $reporter->getData();
}
$resultData = $reporter->getData();