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 "Add .pipeline/ with dev image variant"
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiImport.php
diff --git
a/includes/api/ApiImport.php
b/includes/api/ApiImport.php
index
b36045e
..
e787e26
100644
(file)
--- a/
includes/api/ApiImport.php
+++ b/
includes/api/ApiImport.php
@@
-29,7
+29,6
@@
class ApiImport extends ApiBase {
public function execute() {
$this->useTransactionalTimeLimit();
public function execute() {
$this->useTransactionalTimeLimit();
-
$user = $this->getUser();
$params = $this->extractRequestParams();
$user = $this->getUser();
$params = $this->extractRequestParams();
@@
-37,7
+36,7
@@
class ApiImport extends ApiBase {
$isUpload = false;
if ( isset( $params['interwikisource'] ) ) {
$isUpload = false;
if ( isset( $params['interwikisource'] ) ) {
- if ( !$
user->isAllowed(
'import' ) ) {
+ if ( !$
this->getPermissionManager()->userHasRight( $user,
'import' ) ) {
$this->dieWithError( 'apierror-cantimport' );
}
if ( !isset( $params['interwikipage'] ) ) {
$this->dieWithError( 'apierror-cantimport' );
}
if ( !isset( $params['interwikipage'] ) ) {
@@
-52,7
+51,7
@@
class ApiImport extends ApiBase {
$usernamePrefix = $params['interwikisource'];
} else {
$isUpload = true;
$usernamePrefix = $params['interwikisource'];
} else {
$isUpload = true;
- if ( !$
user->isAllowed(
'importupload' ) ) {
+ if ( !$
this->getPermissionManager()->userHasRight( $user,
'importupload' ) ) {
$this->dieWithError( 'apierror-cantimport-upload' );
}
$source = ImportStreamSource::newFromUpload( 'xml' );
$this->dieWithError( 'apierror-cantimport-upload' );
}
$source = ImportStreamSource::newFromUpload( 'xml' );