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

* (bug 8759) Fixed bug where rollback was allowed on protected pages for wikis where rollback is given to non-sysops.

Browse source 
* Replace rollback permissions error messages with the new variety.
This commit is contained in:
Andrew Garrett 2007-09-10 07:48:20 +00:00
parent 2e5634cc03
commit 0dfeb1fb9f
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
RELEASE-NOTES
View file

@ -38,6 +38,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
message, the level of protection.
* (bug 9611) Supply the blocker and reason for the cantcreateaccounttext
message.
* (bug 8759) Fixed bug where rollback was allowed on protected pages for wikis
where rollback is given to non-sysops.
=== API changes in 1.12 ===

18
includes/Article.php
View file

@ -2188,8 +2188,10 @@ class Article {
public function doRollback( $fromP, $summary, $token, $bot, &$resultDetails ) {
global $wgUser, $wgUseRCPatrol;
$resultDetails = null;
if( $wgUser->isAllowed( 'rollback' ) ) {
# Just in case it's being called from elsewhere
if( $wgUser->isAllowed( 'rollback' ) && $this->mTitle->userCan( 'edit' ) ) {
if( $wgUser->isBlocked() ) {
return self::BLOCKED;
}
@ -2200,6 +2202,7 @@ class Article {
if ( wfReadOnly() ) {
return self::READONLY;
}
if( !$wgUser->matchEditToken( $token, array( $this->mTitle->getPrefixedText(), $fromP ) ) )
return self::BAD_TOKEN;
@ -2282,6 +2285,17 @@ class Article {
global $wgUser, $wgOut, $wgRequest, $wgUseRCPatrol;
$details = null;
# Skip the permissions-checking in doRollback() itself, by checking permissions here.
$perm_errors = array_merge( $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser ),
$this->mTitle->getUserPermissionsErrors( 'rollback', $wgUser ) );
if (count($perm_errors)) {
$wgOut->showPermissionsErrorPage( $perm_errors );
return;
}
$result = $this->doRollback(
$wgRequest->getVal( 'from' ),
$wgRequest->getText( 'summary' ),