diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-08-05 13:45:02 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-08-05 13:45:02 +0200 |
| commit | 4aac578908b5bd2d1e176172b37c72828022f460 (patch) | |
| tree | 0a4abdeafc13990848440f246084039df72c35b7 /phpBB | |
| parent | b34e74254a83a3b43255aece377eb9cf097c3037 (diff) | |
| parent | 771090f13e14def97f3795cc9f13c857bc4681b1 (diff) | |
| download | forums-4aac578908b5bd2d1e176172b37c72828022f460.tar forums-4aac578908b5bd2d1e176172b37c72828022f460.tar.gz forums-4aac578908b5bd2d1e176172b37c72828022f460.tar.bz2 forums-4aac578908b5bd2d1e176172b37c72828022f460.tar.xz forums-4aac578908b5bd2d1e176172b37c72828022f460.zip | |
Merge pull request #3782 from RMcGirr83/ticket/13711
[ticket/13711] Notifications are sent to inactive users
* RMcGirr83/ticket/13711:
[ticket/13711] Notifications are sent to inactive users
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/notification/method/messenger_base.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/notification/method/messenger_base.php b/phpBB/phpbb/notification/method/messenger_base.php index bde4573117..c3aee088f9 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -69,7 +69,7 @@ abstract class messenger_base extends \phpbb\notification\method\base $user = $this->user_loader->get_user($notification->user_id); - if ($user['user_type'] == USER_IGNORE || in_array($notification->user_id, $banned_users)) + if ($user['user_type'] == USER_IGNORE || ($user['user_type'] == USER_INACTIVE && $user['user_inactive_reason'] == INACTIVE_MANUAL) || in_array($notification->user_id, $banned_users)) { continue; } |