summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-13 18:17:07 +0000
committerGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-13 18:17:07 +0000
commitb9d3b47ec65b7b1e5b54cfa7cf43893f14b5f769 (patch)
tree8db8d403c5126927d5a9b9e09c61010a1c9ac32d
parent61b9b3587dec97d7cd10e5c0367a43732b045187 (diff)
downloadbrdo-b9d3b47ec65b7b1e5b54cfa7cf43893f14b5f769.tar.gz
brdo-b9d3b47ec65b7b1e5b54cfa7cf43893f14b5f769.tar.bz2
#55096, don't show online users in block if nobody online, patch by tenrapid
-rw-r--r--modules/user.module12
-rw-r--r--modules/user/user.module12
2 files changed, 14 insertions, 10 deletions
diff --git a/modules/user.module b/modules/user.module
index 3e15ef3e9..1c37286e9 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -601,13 +601,15 @@ 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 3e15ef3e9..1c37286e9 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -601,13 +601,15 @@ 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;