Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#717148 by adrian: Fixed tons of duplication of information during update.php batch.

merge-requests/26/head
Angie Byron 2010-02-17 20:45:36 +00:00
parent a8eddb0d98
commit 8847f4c9a2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
includes/update.inc
View File

@ -708,7 +708,7 @@ function update_do_one($module, $number, $dependency_map, &$context) {
// If this update was aborted in a previous step, or has a dependency that
// was aborted in a previous step, go no further.
if (!empty($context['results']['#abort']) && array_intersect($context['results']['#abort'], array_merge($dependency_map[$function], array($function)))) {
if (!empty($context['results']['#abort']) && array_intersect($context['results']['#abort'], array_merge($dependency_map, array($function)))) {
return;
}
@ -821,7 +821,8 @@ function update_batch($start, $redirect = NULL, $url = NULL, $batch = array(), $
unset($start[$update['module']]);
}
// Add this update function to the batch.
$operations[] = array('update_do_one', array($update['module'], $update['number'], $dependency_map));
$function = $update['module'] . '_update_' . $update['number'];
$operations[] = array('update_do_one', array($update['module'], $update['number'], $dependency_map[$function]));
}
}
$batch['operations'] = $operations;