diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc index 6f1add0..aede8b9 100644 --- a/core/includes/install.core.inc +++ b/core/includes/install.core.inc @@ -15,6 +15,7 @@ use Drupal\Core\Language\Language; use Drupal\Core\Language\LanguageManager; use Drupal\Core\Logger\LoggerChannelFactory; +use Drupal\Core\Render\CacheableHtmlResponse; use Drupal\Core\Site\Settings; use Drupal\Core\StringTranslation\Translator\FileTranslation; use Drupal\Core\Extension\ExtensionDiscovery; @@ -24,7 +25,6 @@ use Symfony\Cmf\Component\Routing\RouteObjectInterface; use Symfony\Component\DependencyInjection\Reference; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; use Symfony\Component\Routing\Route; use Drupal\user\Entity\User; use GuzzleHttp\Exception\RequestException; @@ -984,7 +984,8 @@ function install_display_output($output, $install_state) { $regions['sidebar_first'] = $task_list; } - $response = new Response(); + $bare_html_page_renderer = \Drupal::service('bare_html_page_renderer'); + $response = new CacheableHtmlResponse(); $default_headers = array( 'Expires' => 'Sun, 19 Nov 1978 05:00:00 GMT', 'Last-Modified' => gmdate(DATE_RFC1123, REQUEST_TIME), @@ -992,7 +993,9 @@ function install_display_output($output, $install_state) { 'ETag' => '"' . REQUEST_TIME . '"', ); $response->headers->add($default_headers); - $response->setContent(\Drupal::service('bare_html_page_renderer')->renderBarePage($output, $output['#title'], 'install_page', $regions)); + $response->setContent($bare_html_page_renderer->renderBarePage($output, $output['#title'], 'install_page', $regions)); + + $bare_html_page_renderer->filterResponse($response); $response->send(); exit; }