diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 22:16:06 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2014-05-02 22:16:06 +0200 |
| commit | dbb7552614dfb8af7bd8ac74988c52f06301a9f7 (patch) | |
| tree | 139521686a79777040f736c519651e076d774e5f | |
| parent | 603c3b4629228e529aa0393ecb9e4ff6e012c74a (diff) | |
| parent | 0684d9c6891c38c838b1f169d4a8af40d8e1c810 (diff) | |
| download | forums-dbb7552614dfb8af7bd8ac74988c52f06301a9f7.tar forums-dbb7552614dfb8af7bd8ac74988c52f06301a9f7.tar.gz forums-dbb7552614dfb8af7bd8ac74988c52f06301a9f7.tar.bz2 forums-dbb7552614dfb8af7bd8ac74988c52f06301a9f7.tar.xz forums-dbb7552614dfb8af7bd8ac74988c52f06301a9f7.zip | |
Merge pull request #2384 from prototech/ticket/12477
[ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
* prototech/ticket/12477:
[ticket/12477] Tab instead of spaces.
[ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
| -rw-r--r-- | phpBB/memberlist.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 9c6b3d278f..82143d44cb 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1731,7 +1731,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f $data['user_type'] != USER_IGNORE && // They must not be deactivated by the administrator - ($data['user_type'] != USER_INACTIVE && $data['user_inactive_reason'] == INACTIVE_MANUAL) && + ($data['user_type'] != USER_INACTIVE || $data['user_inactive_reason'] != INACTIVE_MANUAL) && // They must be able to read PMs sizeof($auth->acl_get_list($user_id, 'u_readpm')) && diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 0691355563..7495e6baee 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1609,7 +1609,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) $user_cache[$poster_id]['user_type'] != USER_IGNORE && // They must not be deactivated by the administrator - ($user_cache[$poster_id]['user_type'] != USER_INACTIVE && $user_cache[$poster_id]['user_inactive_reason'] == INACTIVE_MANUAL) && + ($user_cache[$poster_id]['user_type'] != USER_INACTIVE || $user_cache[$poster_id]['user_inactive_reason'] != INACTIVE_MANUAL) && // They must be able to read PMs in_array($poster_id, $can_receive_pm_list) && @@ -1621,7 +1621,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) (($auth->acl_gets('a_', 'm_') || $auth->acl_getf_global('m_')) || $data['user_allow_pm']) ); - $u_pm = ''; + $u_pm = ''; if ($config['allow_privmsg'] && $auth->acl_get('u_sendpm') && $can_receive_pm) { |