diff --git a/core/includes/batch.inc b/core/includes/batch.inc index 7d905cd..a5d6242 100644 --- a/core/includes/batch.inc +++ b/core/includes/batch.inc @@ -135,9 +135,11 @@ function _batch_progress_page() { // additional HTML output by PHP shows up inside the page rather than below // it. While this causes invalid HTML, the same would be true if we didn't, // as content is not allowed to appear after anyway. - $fallback = \Drupal::service('bare_html_page_renderer')->renderBarePage(['#markup' => $fallback], $current_set['title'], 'maintenance_page', array( + $bare_html_page_renderer = \Drupal::service('bare_html_page_renderer'); + $content = $bare_html_page_renderer->renderBarePage(['#markup' => $fallback], $current_set['title'], 'maintenance_page', array( '#show_messages' => FALSE, )); + $fallback = $bare_html_page_renderer->filterRenderArray($content); list($fallback) = explode('', $fallback); print $fallback; diff --git a/core/lib/Drupal/Core/Render/BareHtmlPageRenderer.php b/core/lib/Drupal/Core/Render/BareHtmlPageRenderer.php index 91b5288..ae2fb42 100644 --- a/core/lib/Drupal/Core/Render/BareHtmlPageRenderer.php +++ b/core/lib/Drupal/Core/Render/BareHtmlPageRenderer.php @@ -83,4 +83,14 @@ public function filterResponse(AttachmentsResponseInterface $response) { FinishResponseSubscriber::processAttachments($response); } + /** + * {@inheritdoc} + */ + public function filterRenderArray(array $build) { + $response = new CacheableHtmlResponse($build); + FinishResponseSubscriber::processAttachments($response); + return $response->getContent(); + } + + }