aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_pm_viewmessage.php
diff options
context:
space:
mode:
authorChris Smith <toonarmy@phpbb.com>2009-04-24 20:52:00 +0000
committerChris Smith <toonarmy@phpbb.com>2009-04-24 20:52:00 +0000
commitf9e9274bc353a18ac2e51de85beb5282f495f6f5 (patch)
tree975608004053aa88b93951829899d3c241cb8bc4 /phpBB/includes/ucp/ucp_pm_viewmessage.php
parentf6bb6dda3f3ab856cd77f06dab649697e695292e (diff)
downloadforums-f9e9274bc353a18ac2e51de85beb5282f495f6f5.tar
forums-f9e9274bc353a18ac2e51de85beb5282f495f6f5.tar.gz
forums-f9e9274bc353a18ac2e51de85beb5282f495f6f5.tar.bz2
forums-f9e9274bc353a18ac2e51de85beb5282f495f6f5.tar.xz
forums-f9e9274bc353a18ac2e51de85beb5282f495f6f5.zip
Display the online status of hidden users to users with the u_viewonline permission when viewing PMs.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9483 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_pm_viewmessage.php')
-rw-r--r--phpBB/includes/ucp/ucp_pm_viewmessage.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php
index bdd0e44ea8..5fef30056f 100644
--- a/phpBB/includes/ucp/ucp_pm_viewmessage.php
+++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php
@@ -286,7 +286,7 @@ function get_user_information($user_id, $user_row)
$update_time = $config['load_online_time'] * 60;
if ($row)
{
- $user_row['online'] = (time() - $update_time < $row['online_time'] && ($row['viewonline'])) ? true : false;
+ $user_row['online'] = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || $auth->acl_get('u_viewonline'))) ? true : false;
}
}