r27658 - Code Review

Index: trunk/phase3/includes/SpecialContributions.php
===================================================================
--- trunk/phase3/includes/SpecialContributions.php	(revision 27657)
+++ trunk/phase3/includes/SpecialContributions.php	(revision 27658)
@@ -265,7 +265,7 @@
 	} else {
 		$options['namespace'] = '';
 	}
-	if ( $wgUser->isAllowed( 'rollback' ) && $wgRequest->getBool( 'bot' ) ) {
+	if ( $wgUser->isAllowed( 'markbotedit' ) && $wgRequest->getBool( 'bot' ) ) {
 		$options['bot'] = '1';
 	}
 	
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php	(revision 27657)
+++ trunk/phase3/includes/DefaultSettings.php	(revision 27658)
@@ -1094,6 +1094,7 @@
 $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;
Index: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES	(revision 27657)
+++ trunk/phase3/RELEASE-NOTES	(revision 27658)
@@ -19,6 +19,9 @@
 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