1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-03 06:08:05 +02:00

[ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.

PHPBB3-12477
This commit is contained in:
Cesar G 2014-05-02 12:06:00 -07:00
parent 03594b6443
commit a4a7fcb93d
2 changed files with 2 additions and 2 deletions

View File

@ -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')) &&

View File

@ -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) &&