From b9d3b47ec65b7b1e5b54cfa7cf43893f14b5f769 Mon Sep 17 00:00:00 2001 From: Gerhard Killesreiter Date: Thu, 13 Apr 2006 18:17:07 +0000 Subject: [PATCH] #55096, don't show online users in block if nobody online, patch by tenrapid --- modules/user.module | 12 +++++++----- modules/user/user.module | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/modules/user.module b/modules/user.module index 3e15ef3e940..1c37286e977 100644 --- a/modules/user.module +++ b/modules/user.module @@ -601,14 +601,16 @@ function user_block($op = 'list', $delta = 0, $edit = array()) { // Display a list of currently online users. $max_users = variable_get('user_block_max_list_count', 10); - $items = array(); + if ($total_users && $max_users) { + $items = array(); - while ($max_users-- && $account = db_fetch_object($users)) { - $items[] = $account; + while ($max_users-- && $account = db_fetch_object($users)) { + $items[] = $account; + } + + $output .= theme('user_list', $items, t('Online users')); } - $output .= theme('user_list', $items, t('Online users')); - $block['subject'] = t('Who\'s online'); $block['content'] = $output; } diff --git a/modules/user/user.module b/modules/user/user.module index 3e15ef3e940..1c37286e977 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -601,14 +601,16 @@ function user_block($op = 'list', $delta = 0, $edit = array()) { // Display a list of currently online users. $max_users = variable_get('user_block_max_list_count', 10); - $items = array(); + if ($total_users && $max_users) { + $items = array(); - while ($max_users-- && $account = db_fetch_object($users)) { - $items[] = $account; + while ($max_users-- && $account = db_fetch_object($users)) { + $items[] = $account; + } + + $output .= theme('user_list', $items, t('Online users')); } - $output .= theme('user_list', $items, t('Online users')); - $block['subject'] = t('Who\'s online'); $block['content'] = $output; }