Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F5653
bug18549v2.patch
Public
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Authored By
•
bzimport
Nov 21 2014, 10:35 PM
2014-11-21 22:35:50 (UTC+0)
Size
796 B
Referenced Files
None
Subscribers
None
bug18549v2.patch
View Options
Index: includes/specials/SpecialBlockip.php
===================================================================
--- includes/specials/SpecialBlockip.php (revision 50624)
+++ includes/specials/SpecialBlockip.php (working copy)
@@ -70,7 +70,7 @@
}
public function showForm( $err ) {
- global $wgOut, $wgUser, $wgSysopUserBans;
+ global $wgOut, $wgUser, $wgSysopUserBans, $wgEnableUserEmail;
$wgOut->setPagetitle( wfMsg( 'blockip' ) );
$wgOut->addWikiMsg( 'blockiptext' );
@@ -231,7 +231,7 @@
);
global $wgSysopEmailBans, $wgBlockAllowsUTEdit;
- if( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) ) {
+ if( $wgSysopEmailBans && $wgUser->isAllowed( 'blockemail' ) && $wgEnableUserEmail) {
$wgOut->addHTML("
<tr id='wpEnableEmailBan'>
<td> </td>
File Metadata
Details
Attached
Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5203
Default Alt Text
bug18549v2.patch (796 B)
Attached To
Mode
T20549: "Prevent user from sending email" checkbox still appears even if email is disabled
Attached
Detach File
Event Timeline
Log In to Comment