r22827 - Code Review

From MediaWiki.org

Jump to: navigation, search
Repository:MediaWiki
Revision:r22826 | r22827 (on ViewVC) | r22828 >
Date:21:15, 7 June 2007
Author:amidaniel
Status:ok
Tags:
Comment:Reworked e-mail blocking. To be enabled for a user, it now requires that $wgSysopEmailBans == true and that the user has the right "blockemail".
Modified paths:

Diff [purge]

Index: trunk/phase3/includes/SpecialBlockip.php
===================================================================
--- trunk/phase3/includes/SpecialBlockip.php	(revision 22826)
+++ trunk/phase3/includes/SpecialBlockip.php	(revision 22827)
@@ -243,7 +243,7 @@
 
 		global $wgSysopEmailBans;
 
-		if ( $wgSysopEmailBans ) {
+		if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
 			$wgOut->addHTML("
 			<tr>
 			<td>&nbsp;</td>
Index: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php	(revision 22826)
+++ trunk/phase3/includes/DefaultSettings.php	(revision 22827)
@@ -1061,6 +1061,7 @@
 $wgGroupPermissions['sysop']['autoconfirmed']   = true;
 $wgGroupPermissions['sysop']['upload_by_url']   = true;
 $wgGroupPermissions['sysop']['ipblock-exempt']	= true;
+$wgGroupPermissions['sysop']['blockemail']      = true;
 
 // Permission to change users' group assignments
 $wgGroupPermissions['bureaucrat']['userrights'] = true;

Follow-up revisions

RevisionCommit summaryAuthorDate
r22857Merged revisions 22811-22855 via svnmerge fromdavid00:48, 9 June 2007
Views
Toolbox