diff --git a/core/includes/update.inc b/core/includes/update.inc index d2f2c58..3695a92 100644 --- a/core/includes/update.inc +++ b/core/includes/update.inc @@ -235,7 +235,7 @@ function update_invoke_post_update($function, &$context) { return; } - list($module, ) = explode('_post_update_', $function, 2); + list($module, $name) = explode('_post_update_', $function, 2); module_load_include('php', $module, $module . '.post_update'); if (function_exists($function)) { try { @@ -266,8 +266,10 @@ function update_invoke_post_update($function, &$context) { $context['finished'] = $context['sandbox']['#finished']; unset($context['sandbox']['#finished']); } - - $context['results'][$function] = $ret; + if (!isset($context['results'][$module][$name])) { + $context['results'][$module][$name] = array(); + } + $context['results'][$module][$name] = array_merge($context['results'][$module][$name], $ret); if (!empty($ret['#abort'])) { // Record this function in the list of updates that were aborted. diff --git a/core/modules/block/block.post_update.php b/core/modules/block/block.post_update.php index 4a16ca1..f6cbbd5 100644 --- a/core/modules/block/block.post_update.php +++ b/core/modules/block/block.post_update.php @@ -51,7 +51,6 @@ function block_post_update_disable_blocks_with_missing_contexts() { )) . ''; } $message .= ''; - debug($message); return $message; }