diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2009-04-24 20:52:00 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2009-04-24 20:52:00 +0000 |
| commit | f9e9274bc353a18ac2e51de85beb5282f495f6f5 (patch) | |
| tree | 975608004053aa88b93951829899d3c241cb8bc4 | |
| parent | f6bb6dda3f3ab856cd77f06dab649697e695292e (diff) | |
| download | forums-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
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 9e6b106549..3e0fc55463 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -149,6 +149,7 @@ <li>[Fix] Online status shown when post hidden (Bug #35505 - Patch by Raimon)</li> <li>[Fix] memberlist.php display formating can be distorted by posting long URL for website (Bug #36675 - Patch by TerraFrost)</li> <li>[Fix] queued replies missing from "view new posts" (Bug #42705 - Patch by Paul)</li> + <li>[Fix] Display the online status of hidden users to users with the u_viewonline permission when viewing PMs.</li> <li>[Change] Default difference view is now 'inline' instead of 'side by side'</li> <li>[Change] Added new option for merging differences to conflicting files in automatic updater</li> <li>[Change] Add link to user profile in the MCP for user notes and warn user.</li> 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; } } |