diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-02-17 20:45:36 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-02-17 20:45:36 +0000 |
| commit | 8847f4c9a2edcd2f555d6a47b5037c88c671cc3c (patch) | |
| tree | d90f071ec4a1588cb45c001883857bb92298f9c3 /includes/update.inc | |
| parent | a8eddb0d9824cd9541a7d694e7ac316f71ed947c (diff) | |
| download | brdo-8847f4c9a2edcd2f555d6a47b5037c88c671cc3c.tar.gz brdo-8847f4c9a2edcd2f555d6a47b5037c88c671cc3c.tar.bz2 | |
#717148 by adrian: Fixed tons of duplication of information during update.php batch.
Diffstat (limited to 'includes/update.inc')
| -rw-r--r-- | includes/update.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/includes/update.inc b/includes/update.inc index 4908bfdb8..d057eb88f 100644 --- a/includes/update.inc +++ b/includes/update.inc @@ -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; |