diff --git a/core/modules/system/system.install b/core/modules/system/system.install index d27a3ce091..84ca7a1d9f 100644 --- a/core/modules/system/system.install +++ b/core/modules/system/system.install @@ -2357,7 +2357,6 @@ function system_update_8703(&$sandbox = NULL) { // This must be the first run for this entity type. Initialize the // sub-sandbox for it. if (!isset($sandbox[$entity_type_id])) { - $sandbox[$entity_type_id]['progress'] = 0; $sandbox[$entity_type_id]['current_id'] = -1; } @@ -2394,20 +2393,10 @@ function system_update_8703(&$sandbox = NULL) { ->execute(); } - $sandbox[$entity_type_id]['progress']++; $sandbox[$entity_type_id]['current_id'] = $revision_id; } - $missing = $database->select($revision_table, 't') - ->condition("t.$revision_id_column", $sandbox[$entity_type_id]['current_id'], '>') - ->isNull("t.$revision_parent_column") - ->orderBy($revision_id_column, 'ASC') - ->countQuery() - ->execute() - ->fetchField(); - $sandbox[$entity_type_id]['finished'] = $missing ? $sandbox[$entity_type_id]['progress'] / ($sandbox[$entity_type_id]['progress'] + (int) $missing) : 1; - - if ($sandbox[$entity_type_id]['finished']) { + if (count($revisions) < $step_size) { $sandbox['current']++; } }