diff --git a/core/modules/node/src/Tests/NodeRevisionsUiTest.php b/core/modules/node/src/Tests/NodeRevisionsUiTest.php index 173e010..9159d79 100644 --- a/core/modules/node/src/Tests/NodeRevisionsUiTest.php +++ b/core/modules/node/src/Tests/NodeRevisionsUiTest.php @@ -7,9 +7,10 @@ namespace Drupal\node\Tests; +use Drupal\Component\Utility\SafeMarkup; +use Drupal\Core\Url; use Drupal\node\Entity\NodeType; use Drupal\node\Entity\Node; -use Drupal\Core\Url; /** * Tests the UI for controlling node revision behavior. @@ -121,25 +122,25 @@ function testNodeRevisionDoubleEscapeFix() { 'format' => filter_default_format(), ); $node->setNewRevision(); + $node->revision_log->value = 'Revision message'; $node->save(); $node = Node::load($node->id()); // Make sure we get revision information. $nodes[] = clone $node; $this->drupalGet('node/' . $node->id() . '/revisions'); - $old_revision_message = t('!date by !username !revision-log', array( + + $old_revision_message = t('!date by !username', array( '!date' => \Drupal::l(format_date($nodes[0]->revision_timestamp->value, 'short'), new Url('node.revision_show', array('node' => $nodes[0]->id(), 'node_revision' => $nodes[0]->getRevisionId()))), '!username' => $web_user, - '!revision-log' => ($nodes[0]->revision_log->value != '') ? '

' . $nodes[0]->revision_log->value . '

' : '', - )); - $this->assertRaw($old_revision_message); + )) . (($nodes[0]->revision_log->value != '') ? '

' . $nodes[0]->revision_log->value . '

' : ''); + $this->assertRaw(SafeMarkup::set($old_revision_message)); - $current_revision_message = t('!date by !username !revision-log', array( + $current_revision_message = t('!date by !username', array( '!date' => $nodes[1]->link(format_date($nodes[1]->revision_timestamp->value, 'short')), '!username' => $web_user, - '!revision-log' => ($nodes[1]->revision_log->value != '') ? '

' . $nodes[1]->revision_log->value . '

' : '', - )); - $this->assertRaw($current_revision_message); + )) . (($nodes[1]->revision_log->value != '') ? '

' . $nodes[1]->revision_log->value . '

' : ''); + $this->assertRaw(SafeMarkup::set($current_revision_message)); } }