diff options
| author | Dries Buytaert <dries@buytaert.net> | 2006-01-20 08:58:09 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2006-01-20 08:58:09 +0000 |
| commit | 4a7abb95b69159bd7f16d98106ead78315e97d29 (patch) | |
| tree | 3c1bbef53f8edd3bd590e5e9e8f994d7683cb434 | |
| parent | 56d0d76f0f44434bf12d863c10d16cfb145a2e23 (diff) | |
| download | brdo-4a7abb95b69159bd7f16d98106ead78315e97d29.tar.gz brdo-4a7abb95b69159bd7f16d98106ead78315e97d29.tar.bz2 | |
- Patch #45312 by Robin and Zen: made theme_user_list() more like theme_item_list(), made it robust for empty lists.
| -rw-r--r-- | modules/user.module | 10 | ||||
| -rw-r--r-- | modules/user/user.module | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/modules/user.module b/modules/user.module index 7733eed89..c128c46ea 100644 --- a/modules/user.module +++ b/modules/user.module @@ -584,9 +584,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) { $items[] = $account; } - if ($items) { - $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; @@ -646,8 +644,10 @@ function theme_user_profile($account, $fields) { * @ingroup themeable */ function theme_user_list($users, $title = NULL) { - foreach ($users as $user) { - $items[] = theme('username', $user); + if (!empty($users)) { + foreach ($users as $user) { + $items[] = theme('username', $user); + } } return theme('item_list', $items, $title); } diff --git a/modules/user/user.module b/modules/user/user.module index 7733eed89..c128c46ea 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -584,9 +584,7 @@ function user_block($op = 'list', $delta = 0, $edit = array()) { $items[] = $account; } - if ($items) { - $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; @@ -646,8 +644,10 @@ function theme_user_profile($account, $fields) { * @ingroup themeable */ function theme_user_list($users, $title = NULL) { - foreach ($users as $user) { - $items[] = theme('username', $user); + if (!empty($users)) { + foreach ($users as $user) { + $items[] = theme('username', $user); + } } return theme('item_list', $items, $title); } |