Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.708
diff -u -r1.708 user.module
--- modules/user/user.module	11 Nov 2006 23:52:11 -0000	1.708
+++ modules/user/user.module	13 Nov 2006 20:08:34 -0000
@@ -573,13 +573,12 @@
       case 3:
         if (user_access('access content')) {
           // Count users with activity in the past defined period.
-          $time_period = time() - variable_get('user_block_seconds_online', 900);
+          $interval = time() - variable_get('user_block_seconds_online', 900);
 
           // Perform database queries to gather online user lists.
-          $anonymous_count = sess_count($time_period);
-          $authenticated_count = sess_count($time_period, false);
-          $authenticated_users = db_query('SELECT uid, name, access FROM {users} WHERE access >= %d AND uid != 0 ORDER BY access DESC', time() - $time_period);
-
+          $anonymous_count = sess_count($interval);
+          $authenticated_users = db_query('SELECT u.uid, u.name FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.timestamp >= %d AND s.uid > 0 ORDER BY s.timestamp DESC', $interval);
+          $authenticated_count = db_num_rows($authenticated_users);
 
           // Format the output with proper grammar.
           if ($anonymous_count == 1 && $authenticated_count == 1) {