Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "ApiRollback: Properly deal with UserIdentity"

Browse source
This commit is contained in:
jenkins-bot 2020-02-13 19:40:37 +00:00 committed by Gerrit Code Review
commit df59a848ca
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/api/ApiRollback.php
View file

@ -21,6 +21,7 @@
*/ */
use MediaWiki\ParamValidator\TypeDef\UserDef; use MediaWiki\ParamValidator\TypeDef\UserDef;
use MediaWiki\User\UserIdentity;
/** /**
* @ingroup API * @ingroup API
@ -33,7 +34,7 @@ class ApiRollback extends ApiBase {
private $mTitleObj = null; private $mTitleObj = null;
/** /**
* @var User * @var UserIdentity
*/ */
private $mUser = null; private $mUser = null;
@ -67,7 +68,7 @@ class ApiRollback extends ApiBase {
} ); } );
$retval = $pageObj->doRollback( $retval = $pageObj->doRollback(
$this->getRbUser( $params ), $this->getRbUser( $params )->getName(),
$summary, $summary,
$params['token'], $params['token'],
$params['markbot'], $params['markbot'],
@ -148,9 +149,9 @@ class ApiRollback extends ApiBase {
/** /**
* @param array $params * @param array $params
* *
* @return string * @return UserIdentity
*/ */
private function getRbUser( array $params ) { private function getRbUser( array $params ) : UserIdentity {
if ( $this->mUser !== null ) { if ( $this->mUser !== null ) {
return $this->mUser; return $this->mUser;
} }