.../EventSubscriber/MaintenanceModeSubscriber.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php index 0f54cce..e095ab4 100644 --- a/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php +++ b/core/lib/Drupal/Core/EventSubscriber/MaintenanceModeSubscriber.php @@ -98,10 +98,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) { \Drupal::service('page_cache_kill_switch')->trigger(); if ($request->getRequestFormat() !== 'html') { - $message = SafeMarkup::format($this->config->get('system.maintenance')->get('message'), array( - '@site' => $this->config->get('system.site')->get('name'), - )); - $response = new Response($message, 503, array('Content-Type' => 'text/plain')); + $response = new Response($this->getSiteMaintenanceMessage(), 503, array('Content-Type' => 'text/plain')); $event->setResponse($response); return; } @@ -110,10 +107,7 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) { // Deliver the 503 page if the site is in maintenance mode and the // logged in user is not allowed to bypass it. drupal_maintenance_theme(); - $content = Xss::filterAdmin(SafeMarkup::format($this->config->get('system.maintenance')->get('message'), array( - '@site' => $this->config->get('system.site')->get('name'), - ))); - $response = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $content], $this->t('Site under maintenance'), 'maintenance_page'); + $response = $this->bareHtmlPageRenderer->renderBarePage(['#markup' => $this->getSiteMaintenanceMessage()], $this->t('Site under maintenance'), 'maintenance_page'); $response->setStatusCode(503); $event->setResponse($response); } @@ -134,6 +128,18 @@ public function onKernelRequestMaintenance(GetResponseEvent $event) { } /** + * Gets the site maintenance message. + * + * @return \Drupal\Component\Render\MarkupInterface + * The formatted site maintenance message. + */ + protected function getSiteMaintenanceMessage() { + return SafeMarkup::format($this->config->get('system.maintenance')->get('message'), array( + '@site' => $this->config->get('system.site')->get('name'), + )); + } + + /** * Wraps the drupal_set_message function. */ protected function drupalSetMessage($message = NULL, $type = 'status', $repeat = FALSE) {