Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
drupal
Commits
8847f4c9
Commit
8847f4c9
authored
Feb 17, 2010
by
webchick
Browse files
#717148
by adrian: Fixed tons of duplication of information during update.php batch.
parent
a8eddb0d
Changes
1
Show whitespace changes
Inline
Side-by-side
includes/update.inc
View file @
8847f4c9
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment