Unverified Commit bfecafcf authored by Lauri Timmanee's avatar Lauri Timmanee
Browse files

Issue #3255895 by jrb, murilohp, harshitthakore, xjm: HTML entities in Tour... 

Issue #3255895 by jrb, murilohp, harshitthakore, xjm: HTML entities in Tour tip labels get double-escaped

(cherry picked from commit 18c67bff)
parent a8ca27f4

core/modules/tour/src/TourViewBuilder.php

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ public function viewMultiple(array $entities = [], $view_mode = 'full', $langcod 
        $body = (string) \Drupal::service('renderer')->renderPlain($body_render_array);

        $output = [

          'body' => $body,

          'title' => Html::escape($tip->getLabel()),

          'title' => $tip->getLabel(),

        ];



        $selector = $tip->getSelector();

core/modules/tour/tests/src/Functional/TourTest.php

+2 −2
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public function testTourFunctionality() { 
        'tour-test-1' => [

          'id' => 'tour-code-test-1',

          'plugin' => 'text',

          'label' => 'The rain in spain',

          'label' => 'The rain in spain is <strong>strong</strong>',

          'body' => 'Falls mostly on the plain.',

          'weight' => '100',

          'selector' => '#tour-code-test-1',
@@ -194,7 +194,7 @@ public function testTourFunctionality() { 


    $elements = $this->findTip([

      'id' => 'tour-code-test-1',

      'title' => 'The rain in spain',

      'title' => 'The rain in spain is <strong>strong</strong>',

    ]);

    $this->assertCount(1, $elements, 'Found the required tip markup for tip 4');