Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.256
diff -u -r1.256 theme.inc
--- includes/theme.inc	28 Aug 2005 15:29:34 -0000	1.256
+++ includes/theme.inc	5 Sep 2005 16:34:48 -0000
@@ -806,7 +806,7 @@
 function theme_block($block) {
   $output  = "<div class=\"block block-$block->module\" id=\"block-$block->module-$block->delta\">\n";
   $output .= " <h2 class=\"title\">$block->subject</h2>\n";
-  $output .= " <div class=\"content\">$block->content</div>\n";
+  $output .= " <div class=\"content\">".(is_array($block->content) ? implode('', $block->content) : $block->content) ."</div>\n";
   $output .= "</div>\n";
   return $output;
 }
Index: modules/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user.module,v
retrieving revision 1.502
diff -u -r1.502 user.module
--- modules/user.module	25 Aug 2005 21:14:17 -0000	1.502
+++ modules/user.module	5 Sep 2005 16:34:54 -0000
@@ -571,13 +571,14 @@
           $guests = db_fetch_object(db_query('SELECT COUNT(sid) AS count FROM {sessions} WHERE timestamp >= %d AND uid = 0', time() - $time_period));
           $users = db_query('SELECT uid, name, access FROM {users} WHERE access >= %d AND uid != 0 ORDER BY access DESC', time() - $time_period);
           $total_users = db_num_rows($users);
-
+          
           // Format the output with proper grammar.
+          $output = array();
           if ($total_users == 1 && $guests->count == 1) {
-            $output = t('There is currently %members and %visitors online.', array('%members' => format_plural($total_users, '1 user', '%count users'), '%visitors' => format_plural($guests->count, '1 guest', '%count guests')));
+            $output['message'] = t('There is currently %members and %visitors online.', array('%members' => format_plural($total_users, '1 user', '%count users'), '%visitors' => format_plural($guests->count, '1 guest', '%count guests')));
           }
           else {
-            $output = t('There are currently %members and %visitors online.', array('%members' => format_plural($total_users, '1 user', '%count users'), '%visitors' => format_plural($guests->count, '1 guest', '%count guests')));
+            $output['message'] = t('There are currently %members and %visitors online.', array('%members' => format_plural($total_users, '1 user', '%count users'), '%visitors' => format_plural($guests->count, '1 guest', '%count guests')));
           }
 
           // Display a list of currently online users.
@@ -589,7 +590,7 @@
           }
 
           if ($items) {
-            $output .= theme('user_list', $items, t('Online users'));
+            $output['list']= theme('user_list', $items, t('Online users'));
           }
 
           $block['subject'] = t('Who\'s online');
Index: themes/bluemarine/block.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/block.tpl.php,v
retrieving revision 1.2
diff -u -r1.2 block.tpl.php
--- themes/bluemarine/block.tpl.php	10 May 2005 19:11:04 -0000	1.2
+++ themes/bluemarine/block.tpl.php	5 Sep 2005 16:34:54 -0000
@@ -1,4 +1,4 @@
   <div class="block block-<?php print $block->module; ?>" id="block-<?php print $block->module; ?>-<?php print $block->delta; ?>">
     <h2 class="title"><?php print $block->subject; ?></h2>
-    <div class="content"><?php print $block->content; ?></div>
+    <div class="content"><?php print is_array($block->content) ? implode('', $block->content) : $block->content; ?></div>
  </div>
Index: themes/pushbutton/block.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/block.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 block.tpl.php
--- themes/pushbutton/block.tpl.php	5 May 2005 10:58:27 -0000	1.1
+++ themes/pushbutton/block.tpl.php	5 Sep 2005 16:34:55 -0000
@@ -1,4 +1,4 @@
 <div class="<?php print "block block-$block->module" ?>" id="<?php print "block-$block->module-$block->delta"; ?>">
   <div class="title"><h3><?php print $block->subject ?></h3></div>
-  <div class="content"><?php print $block->content ?></div>
+  <div class="content"><?php print is_array($block->content) ? implode('', $block->content) : $block->content ?></div>
 </div>
\ No newline at end of file