Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
drupal
Commits
8847f4c9
Commit
8847f4c9
authored
15 years ago
by
Angie Byron
Browse files
Options
Downloads
Patches
Plain Diff
#717148
by adrian: Fixed tons of duplication of information during update.php batch.
parent
a8eddb0d
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!7452
Issue #1797438. HTML5 validation is preventing form submit and not fully...
,
!789
Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
includes/update.inc
+3
-2
3 additions, 2 deletions
includes/update.inc
with
3 additions
and
2 deletions
includes/update.inc
+
3
−
2
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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment