aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorGraham Eames <grahamje@users.sourceforge.net>2005-12-17 22:38:18 +0000
committerGraham Eames <grahamje@users.sourceforge.net>2005-12-17 22:38:18 +0000
commit731f67872bd216f6c1148e7391775d3b272710f6 (patch)
tree8a9d8f126668b3c10969c59e449be0be760d6cd7 /phpBB/includes/functions.php
parentcd1a39111bc25ae4df56c1be6f021dccd79052dd (diff)
downloadforums-731f67872bd216f6c1148e7391775d3b272710f6.tar
forums-731f67872bd216f6c1148e7391775d3b272710f6.tar.gz
forums-731f67872bd216f6c1148e7391775d3b272710f6.tar.bz2
forums-731f67872bd216f6c1148e7391775d3b272710f6.tar.xz
forums-731f67872bd216f6c1148e7391775d3b272710f6.zip
Fix an issue with hidden users showing up on the online list if their
global setting was yes but they had hidden for this session git-svn-id: file:///svn/phpbb/trunk@5350 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index a453ad9edb..b5e6f5671a 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1675,7 +1675,7 @@ function page_header($page_title = '')
$logged_hidden_online++;
}
- if ($row['user_allow_viewonline'] || $auth->acl_get('u_viewonline'))
+ if ( ($row['user_allow_viewonline'] && $row['session_viewonline']) || $auth->acl_get('u_viewonline') )
{
$user_online_link = ($row['user_type'] <> USER_IGNORE) ? "<a href=\"{$phpbb_root_path}memberlist.$phpEx$SID&amp;mode=viewprofile&amp;u=" . $row['user_id'] . '">' . $user_online_link . '</a>' : $user_online_link;
$online_userlist .= ($online_userlist != '') ? ', ' . $user_online_link : $user_online_link;