diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-12 09:20:13 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-10-12 09:20:13 +0200 |
| commit | fcf797c3f262df43ed2df5fdd6718dd61b38ea60 (patch) | |
| tree | 61244566efe5f14a78826810533d3cdbbc18d433 | |
| parent | 766fc3a394ac0395b8e59c1a2f7b6b6dc17940df (diff) | |
| parent | 5f8fb38b529ef0b04fcfbaaee940b29e7a5e92b1 (diff) | |
| download | forums-fcf797c3f262df43ed2df5fdd6718dd61b38ea60.tar forums-fcf797c3f262df43ed2df5fdd6718dd61b38ea60.tar.gz forums-fcf797c3f262df43ed2df5fdd6718dd61b38ea60.tar.bz2 forums-fcf797c3f262df43ed2df5fdd6718dd61b38ea60.tar.xz forums-fcf797c3f262df43ed2df5fdd6718dd61b38ea60.zip | |
Merge branch '3.1.x'
* 3.1.x:
[ticket/14200] Allow hidden users to see himself on viewonline
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/viewonline.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 58b2f0ca57..9389a2df28 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3653,7 +3653,7 @@ function obtain_users_online_string($online_users, $item_id = 0, $item = 'forum' $row['username'] = '<em>' . $row['username'] . '</em>'; } - if (!isset($online_users['hidden_users'][$row['user_id']]) || $auth->acl_get('u_viewonline')) + if (!isset($online_users['hidden_users'][$row['user_id']]) || $auth->acl_get('u_viewonline') || $row['user_id'] === $user->data['user_id']) { $user_online_link[$row['user_id']] = get_username_string(($row['user_type'] <> USER_IGNORE) ? 'full' : 'no_profile', $row['user_id'], $row['username'], $row['user_colour']); } diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index a44a4b218e..765599f165 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -196,7 +196,7 @@ while ($row = $db->sql_fetchrow($result)) if (!$row['session_viewonline']) { - $view_online = ($auth->acl_get('u_viewonline')) ? true : false; + $view_online = ($auth->acl_get('u_viewonline') || $row['user_id'] === $user->data['user_id']) ? true : false; $logged_hidden_online++; $username_full = '<em>' . $username_full . '</em>'; |