aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/memberlist.php
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-05-02 12:06:00 -0700
committerCesar G <prototech91@gmail.com>2014-05-02 13:05:25 -0700
commita4a7fcb93df33c41d1d0faa51e3c322145e97b4e (patch)
tree506e0b4b9e4c2264066f7ff3e72af7cff1fd7b40 /phpBB/memberlist.php
parent03594b64438464ba7f234ce38d3344561bc0a66b (diff)
downloadforums-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/memberlist.php')
-rw-r--r--phpBB/memberlist.php2
1 files changed, 1 insertions, 1 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')) &&