Merge "Allow setting email even when blocked from sending emails"

diff --git a/includes/specials/SpecialChangeEmail.php b/includes/specials/SpecialChangeEmail.php
index 956ff77..c95aa1b 100644 (file)
--- a/includes/specials/SpecialChangeEmail.php
+++ b/includes/specials/SpecialChangeEmail.php
@@ -78,10 +78,6 @@ class SpecialChangeEmail extends FormSpecialPage {
                        throw new PermissionsError( 'viewmyprivateinfo' );
                }
 
-               if ( $user->isBlockedFromEmailuser() ) {
-                       throw new UserBlockedError( $user->getBlock() );
-               }
-
                parent::checkExecutePermissions( $user );
        }