Index: update.php
===================================================================
RCS file: /cvs/drupal/drupal/update.php,v
retrieving revision 1.228
diff -u -p -u -p -r1.228 update.php
--- update.php	15 Jul 2007 05:57:40 -0000	1.228
+++ update.php	15 Aug 2007 16:50:24 -0000
@@ -285,6 +285,9 @@ function update_do_one($module, $number,
   if (function_exists($function)) {
     $ret = $function($context['sandbox']);
   }
+  if (empty($ret) || !is_array($ret)) {
+    $ret = array();
+  }
 
   if (isset($ret['#finished'])) {
     $context['finished'] = $ret['#finished'];
@@ -297,7 +300,7 @@ function update_do_one($module, $number,
   if (!isset($context['results'][$module][$number])) {
     $context['results'][$module][$number] = array();
   }
-  $context['results'][$module][$number] = array_merge($context['results'][$module][$number], $ret);;
+  $context['results'][$module][$number] = array_merge($context['results'][$module][$number], $ret);
 
   if ($context['finished'] == 1) {
     // Update the installed version