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("