wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-28 09:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
jenkins-bot 2018-08-23 19:02:48 +00:00 committed by Gerrit Code Review
parent a0ad95b63f 2b0929a4b1
commit b0d83815b9
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;
}