diff --git a/core/lib/Drupal/Core/Utility/BatchStorage.php b/core/lib/Drupal/Core/Utility/BatchStorage.php index 5dacec3..c8efa1f 100644 --- a/core/lib/Drupal/Core/Utility/BatchStorage.php +++ b/core/lib/Drupal/Core/Utility/BatchStorage.php @@ -30,10 +30,7 @@ public function __construct(Connection $connection, Request $request) { /** * {@inheritdoc} */ - public function load($id = NULL) { - if (!$id) { - $id = $this->request->get('id'); - } + public function load($id) { $batch = $this->connection->query("SELECT batch FROM {batch} WHERE bid = :bid AND token = :token", array( ':bid' => $id, ':token' => drupal_get_token($id), diff --git a/core/lib/Drupal/Core/Utility/BatchStorageInterface.php b/core/lib/Drupal/Core/Utility/BatchStorageInterface.php index 4caf24a..5d310df 100644 --- a/core/lib/Drupal/Core/Utility/BatchStorageInterface.php +++ b/core/lib/Drupal/Core/Utility/BatchStorageInterface.php @@ -1,7 +1,8 @@ load(); + $batch = Drupal::service('batch.storage')->load($_REQUEST['id']); } // Use the same theme as the page that started the batch. if (!empty($batch['theme'])) {