wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-09-24 02:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't send email notifs to blocked users if $wgBlockDisablesLogin is true

Browse source 
Bug: T199993
Change-Id: I47ed3599d61ca8177cdd0820dea4089fdb087d82
This commit is contained in:
Roan Kattouw 2018-08-22 15:09:30 -07:00
parent 7f48cfbdb9
commit 2b0929a4b1
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
includes/Notifier.php
View file

@ -31,13 +31,18 @@ class EchoNotifier {
* @return bool
*/
public static function notifyWithEmail( $user, $event ) {
global $wgEnableEmail;
global $wgEnableEmail, $wgBlockDisablesLogin;
if ( !$wgEnableEmail ) {
return false;
}
// No valid email address or email notification
if ( !$user->isEmailConfirmed() || $user->getOption( 'echo-email-frequency' ) < 0 ) {
if (
// Email is globally disabled
!$wgEnableEmail ||
// User does not have a valid and confirmed email address
!$user->isEmailConfirmed() ||
// User has disabled Echo emails
$user->getOption( 'echo-email-frequency' ) < 0 ||
// User is blocked and cannot log in (T199993)
( $wgBlockDisablesLogin && $user->isBlocked() )
) {
return false;
}