Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.681
diff -u -F^f -r1.681 user.module
--- modules/user/user.module	11 Sep 2006 09:05:46 -0000	1.681
+++ modules/user/user.module	13 Sep 2006 22:33:40 -0000
@@ -572,12 +572,12 @@ function user_block($op = 'list', $delta
       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);
+          $begin_timestamp = 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($begin_timestamp);
+          $authenticated_count = sess_count($begin_timestamp, false);
+          $authenticated_users = db_query('SELECT u.uid, u.name, u.access FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE u.uid != 0 AND u.access >= %d ORDER BY u.access DESC', $begin_timestamp);
 
 
           // Format the output with proper grammar.