Update to drupal 8.0.0-rc1. For more information, see https://www.drupal.org/node/2582663
This commit is contained in:
parent
eb34d130a8
commit
f32e58e4b1
8476 changed files with 211648 additions and 170042 deletions
core/includes
|
@ -47,14 +47,7 @@ function _batch_page(Request $request) {
|
|||
return new RedirectResponse(\Drupal::url('<front>', [], ['absolute' => TRUE]));
|
||||
}
|
||||
}
|
||||
// Restore safe strings from previous batches.
|
||||
// This is safe because we are passing through the known safe values from
|
||||
// SafeMarkup::getAll(). See _batch_shutdown().
|
||||
// @todo Ensure we are not storing an excessively large string list in:
|
||||
// https://www.drupal.org/node/2295823
|
||||
if (!empty($batch['safe_strings'])) {
|
||||
SafeMarkup::setMultiple($batch['safe_strings']);
|
||||
}
|
||||
|
||||
// Register database update for the end of processing.
|
||||
drupal_register_shutdown_function('_batch_shutdown');
|
||||
|
||||
|
@ -521,10 +514,6 @@ function _batch_finished() {
|
|||
*/
|
||||
function _batch_shutdown() {
|
||||
if ($batch = batch_get()) {
|
||||
// Update safe strings.
|
||||
// @todo Ensure we are not storing an excessively large string list in:
|
||||
// https://www.drupal.org/node/2295823
|
||||
$batch['safe_strings'] = SafeMarkup::getAll();
|
||||
\Drupal::service('batch.storage')->update($batch);
|
||||
}
|
||||
}
|
||||
|
|
Reference in a new issue