From: Daniel Cannon <amidaniel@users.mediawiki.org>
Date: Thu, 7 Jun 2007 21:15:59 +0000 (+0000)
Subject: Reworked e-mail blocking. To be enabled for a user, it now requires that $wgSysopEmai... 
X-Git-Tag: 1.31.0-rc.0~52625
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=73f6335ab6e8a53fdeee14d594d83a1c9f24d101;p=lhc%2Fweb%2Fwiklou.git

Reworked e-mail blocking. To be enabled for a user, it now requires that $wgSysopEmailBans == true and that the user has the right "blockemail".
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 379faab0e5..5f4d28d3ca 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1061,6 +1061,7 @@ $wgGroupPermissions['sysop']['unwatchedpages']  = true;
 $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;
diff --git a/includes/SpecialBlockip.php b/includes/SpecialBlockip.php
index 1211f3f130..c02d3ec714 100644
--- a/includes/SpecialBlockip.php
+++ b/includes/SpecialBlockip.php
@@ -243,7 +243,7 @@ class IPBlockForm {
 
 		global $wgSysopEmailBans;
 
-		if ( $wgSysopEmailBans ) {
+		if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
 			$wgOut->addHTML("
 			<tr>
 			<td>&nbsp;</td>