From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Tue, 20 Nov 2007 07:11:39 +0000 (+0000)
Subject: * Marking edits as bot edits with Special:Contributions?bot=1 now requires the markbo... 
X-Git-Tag: 1.31.0-rc.0~50793
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=7de9ce3a00b6b90ae43778a68f68de14fd6364e2;p=lhc%2Fweb%2Fwiklou.git

* Marking edits as bot edits with Special:Contributions?bot=1 now requires the markbotedit permission, rather than the rollback permission previously used. This permission is assigned by default to the sysop group.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c839013de3..c813cfa1b2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -19,6 +19,9 @@ Those wishing to use the latest code instead of a branch release can obtain
 it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 
 === Configuration changes in 1.12 ===
+* Marking edits as bot edits with Special:Contributions?bot=1 now requires the
+  markbotedit permission, rather than the rollback permission previously used.
+  This permission is assigned by default to the sysop group.
 
 === New features in 1.12 ===
 * (bug 10735) Add a warning for non-descriptive filenames at Special:Upload
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 63c93b6107..c13996487d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1094,6 +1094,7 @@ $wgGroupPermissions['sysop']['autoconfirmed']   = true;
 $wgGroupPermissions['sysop']['upload_by_url']   = true;
 $wgGroupPermissions['sysop']['ipblock-exempt']	= true;
 $wgGroupPermissions['sysop']['blockemail']      = true;
+$wgGroupPermissions['sysop']['markbotedits']	= true;
 
 // Permission to change users' group assignments
 $wgGroupPermissions['bureaucrat']['userrights'] = true;
diff --git a/includes/SpecialContributions.php b/includes/SpecialContributions.php
index e85ec43bfb..b4e9bbf784 100644
--- a/includes/SpecialContributions.php
+++ b/includes/SpecialContributions.php
@@ -265,7 +265,7 @@ function wfSpecialContributions( $par = null ) {
 	} else {
 		$options['namespace'] = '';
 	}
-	if ( $wgUser->isAllowed( 'rollback' ) && $wgRequest->getBool( 'bot' ) ) {
+	if ( $wgUser->isAllowed( 'markbotedit' ) && $wgRequest->getBool( 'bot' ) ) {
 		$options['bot'] = '1';
 	}