r22827 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r22826‎ | r22827 | r22828 >
Date:21:15, 7 June 2007
Author:amidaniel
Status:old
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:
  • /trunk/phase3/includes/DefaultSettings.php (modified) (history)
  • /trunk/phase3/includes/SpecialBlockip.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/SpecialBlockip.php
@@ -243,7 +243,7 @@
244244
245245 global $wgSysopEmailBans;
246246
247 - if ( $wgSysopEmailBans ) {
 247+ if ( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
248248 $wgOut->addHTML("
249249 <tr>
250250 <td>&nbsp;</td>
Index: trunk/phase3/includes/DefaultSettings.php
@@ -1061,6 +1061,7 @@
10621062 $wgGroupPermissions['sysop']['autoconfirmed'] = true;
10631063 $wgGroupPermissions['sysop']['upload_by_url'] = true;
10641064 $wgGroupPermissions['sysop']['ipblock-exempt'] = true;
 1065+$wgGroupPermissions['sysop']['blockemail'] = true;
10651066
10661067 // Permission to change users' group assignments
10671068 $wgGroupPermissions['bureaucrat']['userrights'] = true;

Follow-up revisions

RevisionCommit summaryAuthorDate
r22857Merged revisions 22811-22855 via svnmerge from...david00:48, 9 June 2007

Status & tagging log