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 | 452c8bef28b363d50869421cf3346c23a25b6148 (patch) | |
| tree | 2a616c9b53cce04821a123e4e5f437e487f5c7cf /phpBB/phpbb/notification | |
| parent | 50cf610eb6738d2577c44f423c072727451b70f4 (diff) | |
| parent | 4aac578908b5bd2d1e176172b37c72828022f460 (diff) | |
| download | forums-452c8bef28b363d50869421cf3346c23a25b6148.tar forums-452c8bef28b363d50869421cf3346c23a25b6148.tar.gz forums-452c8bef28b363d50869421cf3346c23a25b6148.tar.bz2 forums-452c8bef28b363d50869421cf3346c23a25b6148.tar.xz forums-452c8bef28b363d50869421cf3346c23a25b6148.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/13711] Notifications are sent to inactive users
Diffstat (limited to 'phpBB/phpbb/notification')
| -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 74a1811155..61119b9882 100644 --- a/phpBB/phpbb/notification/method/messenger_base.php +++ b/phpBB/phpbb/notification/method/messenger_base.php @@ -91,7 +91,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; } |