Unverified Commit 967e1677 authored by Lee Rowlands's avatar Lee Rowlands
Browse files

Issue #3212498 by vsujeetkumar, guilhermevp, Lms300, paulocs, ravi.shankar,... 

Issue #3212498 by vsujeetkumar, guilhermevp, Lms300, paulocs, ravi.shankar, pragati_kanade, mitthukumawat, Spokje, longwave: Incorrect break (</br>) tag
parent 749dd1d0

core/lib/Drupal/Core/EventSubscriber/FinalExceptionSubscriber.php

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ public function onException(ExceptionEvent $event) { 


    $content_type = $event->getRequest()->getRequestFormat() == 'html' ? 'text/html' : 'text/plain';

    $content = $this->t('The website encountered an unexpected error. Please try again later.');

    $content .= $message ? '</br></br>' . $message : '';

    $content .= $message ? '<br><br>' . $message : '';

    $response = new Response($content, 500, ['Content-Type' => $content_type]);



    if ($exception instanceof HttpExceptionInterface) {

core/modules/content_moderation/src/Form/ContentModerationConfigureForm.php

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta 
      $form['entity_types_container']['entity_types'][$entity_type->id()] = [

        'type' => [

          '#type' => 'inline_template',

          '#template' => '<strong>{{ label }}</strong></br><span id="selected-{{ entity_type_id }}">{{ selected_bundles }}</span>',

          '#template' => '<strong>{{ label }}</strong><br><span id="selected-{{ entity_type_id }}">{{ selected_bundles }}</span>',

          '#context' => [

            'label' => $this->t('@bundle types', ['@bundle' => $entity_type->getLabel()]),

            'entity_type_id' => $entity_type->id(),

core/tests/Drupal/KernelTests/Core/Routing/ExceptionHandlingTest.php

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ public function testExceptionEscaping() { 
    // final exception subscriber, it is printed as partial HTML, and hence

    // escaped.

    $this->assertEquals('text/plain; charset=UTF-8', $response->headers->get('Content-type'));

    $this->assertStringStartsWith('The website encountered an unexpected error. Please try again later.</br></br><em class="placeholder">Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException</em>: Not acceptable format: json&lt;script&gt;alert(123);&lt;/script&gt; in <em class="placeholder">', $response->getContent());

    $this->assertStringStartsWith('The website encountered an unexpected error. Please try again later.<br><br><em class="placeholder">Symfony\Component\HttpKernel\Exception\NotAcceptableHttpException</em>: Not acceptable format: json&lt;script&gt;alert(123);&lt;/script&gt; in <em class="placeholder">', $response->getContent());

  }



}

core/tests/Drupal/Tests/Core/EventSubscriber/FinalExceptionSubscriberTest.php

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ public function testOnExceptionWithUnknownFormat() { 
    $response = $event->getResponse();



    $this->assertInstanceOf(Response::class, $response);

    $this->stringStartsWith('The website encountered an unexpected error. Please try again later.</br></br><em class="placeholder">Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException</em>: test message in ', $response->getContent());

    $this->stringStartsWith('The website encountered an unexpected error. Please try again later.<br><br><em class="placeholder">Symfony\Component\HttpKernel\Exception\MethodNotAllowedHttpException</em>: test message in ', $response->getContent());

    $this->assertEquals(405, $response->getStatusCode());

    $this->assertEquals('POST, PUT', $response->headers->get('Allow'));

    // Also check that the text/plain content type was added.