$user = $this->getUser();
$params = $this->extractRequestParams();
- // WikiPage::doRollback needs a Web UI token, so get one of those if we
- // validated based on an API rollback token.
- $token = $params['token'];
- if ( $user->matchEditToken( $token, 'rollback', $this->getRequest() ) ) {
- $token = $this->getUser()->getEditToken(
- $this->getWebUITokenSalt( $params ),
- $this->getRequest()
- );
- }
-
$titleObj = $this->getRbTitle( $params );
$pageObj = WikiPage::factory( $titleObj );
$summary = $params['summary'];
$retval = $pageObj->doRollback(
$this->getRbUser( $params ),
$summary,
- $token,
+ $params['token'],
$params['markbot'],
$details,
$user,
);
if ( $retval ) {
- // We don't care about multiple errors, just report one of them
- $this->dieUsageMsg( reset( $retval ) );
+ $this->dieStatus( $this->errorArrayToStatus( $retval, $user ) );
}
$watch = 'preferences';
'pageid' => intval( $details['current']->getPage() ),
'summary' => $details['summary'],
'revid' => intval( $details['newid'] ),
+ // The revision being reverted (previously the current revision of the page)
'old_revid' => intval( $details['current']->getID() ),
+ // The revision being restored (the last revision before revision(s) by the reverted user)
'last_revid' => intval( $details['target']->getID() )
];
return 'rollback';
}
- protected function getWebUITokenSalt( array $params ) {
- return [
- $this->getRbTitle( $params )->getPrefixedText(),
- $this->getRbUser( $params )
- ];
- }
-
/**
* @param array $params
*
? $params['user']
: User::getCanonicalName( $params['user'] );
if ( !$this->mUser ) {
- $this->dieUsageMsg( [ 'invaliduser', $params['user'] ] );
+ $this->dieWithError( [ 'apierror-invaliduser', wfEscapeWikiText( $params['user'] ) ] );
}
return $this->mUser;
if ( isset( $params['title'] ) ) {
$this->mTitleObj = Title::newFromText( $params['title'] );
if ( !$this->mTitleObj || $this->mTitleObj->isExternal() ) {
- $this->dieUsageMsg( [ 'invalidtitle', $params['title'] ] );
+ $this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $params['title'] ) ] );
}
} elseif ( isset( $params['pageid'] ) ) {
$this->mTitleObj = Title::newFromID( $params['pageid'] );
if ( !$this->mTitleObj ) {
- $this->dieUsageMsg( [ 'nosuchpageid', $params['pageid'] ] );
+ $this->dieWithError( [ 'apierror-nosuchpageid', $params['pageid'] ] );
}
}
if ( !$this->mTitleObj->exists() ) {
- $this->dieUsageMsg( 'notanarticle' );
+ $this->dieWithError( 'apierror-missingtitle' );
}
return $this->mTitleObj;