From 731f67872bd216f6c1148e7391775d3b272710f6 Mon Sep 17 00:00:00 2001
From: Graham Eames <grahamje@users.sourceforge.net>
Date: Sat, 17 Dec 2005 22:38:18 +0000
Subject: [PATCH] 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
---
 phpBB/includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;