diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-07-03 15:14:20 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-07-03 15:14:20 +0000 |
| commit | 52f5c7d1ee6a9cfe7bd1a0b3a5d7262feebe6dc8 (patch) | |
| tree | 50d2c5aa61c8069d7067d7ce38f17055ad5ea62e /phpBB/ucp.php | |
| parent | d2079e4ae8240731160b7c1e64a41c65a64a349b (diff) | |
| download | forums-52f5c7d1ee6a9cfe7bd1a0b3a5d7262feebe6dc8.tar forums-52f5c7d1ee6a9cfe7bd1a0b3a5d7262feebe6dc8.tar.gz forums-52f5c7d1ee6a9cfe7bd1a0b3a5d7262feebe6dc8.tar.bz2 forums-52f5c7d1ee6a9cfe7bd1a0b3a5d7262feebe6dc8.tar.xz forums-52f5c7d1ee6a9cfe7bd1a0b3a5d7262feebe6dc8.zip | |
#12955 hideonline/viewonline again (minor)
git-svn-id: file:///svn/phpbb/trunk@7828 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/ucp.php')
| -rwxr-xr-x | phpBB/ucp.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/ucp.php b/phpBB/ucp.php index b63c07ef2a..774f0e5651 100755 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -256,7 +256,7 @@ if ($module->is_active('zebra', 'friends')) $update_time = $config['load_online_time'] * 60; $sql = $db->sql_build_query('SELECT_DISTINCT', array( - 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, u.user_allow_viewonline, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', + 'SELECT' => 'u.user_id, u.username, u.username_clean, u.user_colour, MAX(s.session_time) as online_time, MIN(s.session_viewonline) AS viewonline', 'FROM' => array( USERS_TABLE => 'u', @@ -274,7 +274,7 @@ if ($module->is_active('zebra', 'friends')) AND z.friend = 1 AND u.user_id = z.zebra_id', - 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_allow_viewonline, u.user_colour, u.username', + 'GROUP_BY' => 'z.zebra_id, u.user_id, u.username_clean, u.user_colour, u.username', 'ORDER_BY' => 'u.username_clean ASC', )); @@ -283,7 +283,7 @@ if ($module->is_active('zebra', 'friends')) while ($row = $db->sql_fetchrow($result)) { - $which = (time() - $update_time < $row['online_time'] && $row['viewonline'] && $row['user_allow_viewonline']) ? 'online' : 'offline'; + $which = (time() - $update_time < $row['online_time'] && ($row['viewonline'] || $auth->acl_get('u_viewonline'))) ? 'online' : 'offline'; $template->assign_block_vars("friends_{$which}", array( 'USER_ID' => $row['user_id'], |