diff options
| author | Cesar G <prototech91@gmail.com> | 2014-05-02 12:06:00 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-05-02 13:05:25 -0700 |
| commit | a4a7fcb93df33c41d1d0faa51e3c322145e97b4e (patch) | |
| tree | 506e0b4b9e4c2264066f7ff3e72af7cff1fd7b40 /phpBB | |
| parent | 03594b64438464ba7f234ce38d3344561bc0a66b (diff) | |
| download | forums-a4a7fcb93df33c41d1d0faa51e3c322145e97b4e.tar forums-a4a7fcb93df33c41d1d0faa51e3c322145e97b4e.tar.gz forums-a4a7fcb93df33c41d1d0faa51e3c322145e97b4e.tar.bz2 forums-a4a7fcb93df33c41d1d0faa51e3c322145e97b4e.tar.xz forums-a4a7fcb93df33c41d1d0faa51e3c322145e97b4e.zip | |
[ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.
PHPBB3-12477
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/memberlist.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
2 files changed, 2 insertions, 2 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..c46f30d038 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) && |