diff --git a/core/modules/node/src/Controller/NodeController.php b/core/modules/node/src/Controller/NodeController.php index de462e6..f34d4ef 100644 --- a/core/modules/node/src/Controller/NodeController.php +++ b/core/modules/node/src/Controller/NodeController.php @@ -182,22 +182,20 @@ public function revisionOverview(NodeInterface $node) { '#theme' => 'username', '#account' => $revision_author, ); - $row[] = array( - 'data' => array( + $row[] = [ + 'data' => [ '#type' => 'inline_template', '#template' => '{{ author }}{% if message %}

{{ message }}

{% endif %}', - '#context' => array( - 'author' => $this->t('!date by !username', - array( - '!date' => $node->link($this->dateFormatter->format($revision->revision_timestamp->value, 'short')), - '!username' => \Drupal::service('renderer')->render($username), - ) - ), + '#context' => [ + 'author' => $this->t('!date by !username', [ + '!date' => $node->link($this->dateFormatter->format($revision->revision_timestamp->value, 'short')), + '!username' => \Drupal::service('renderer')->render($username), + ]), 'message' => Xss::filter($revision->revision_log->value), - ), - ), + ], + ], 'class' => array('revision-current'), - ); + ]; $row[] = array( 'data' => SafeMarkup::placeholder($this->t('current revision')), 'class' => array('revision-current'), @@ -208,21 +206,17 @@ public function revisionOverview(NodeInterface $node) { '#theme' => 'username', '#account' => $revision_author, ); - $row[] = array( - 'data' => array( - '#type' => 'inline_template', - '#template' => '{{ author }}{% if message %}

{{ message }}

{% endif %}', - '#context' => array( - 'author' => $this->t('!date by !username', - array( - '!date' => $this->l($this->dateFormatter->format($revision->revision_timestamp->value, 'short'), new Url('entity.node.revision', array('node' => $node->id(), 'node_revision' => $vid))), - '!username' => \Drupal::service('renderer')->render($username), - ) - ), - 'message' => Xss::filter($revision->revision_log->value), - ), - ), - ); + $row[] = ['data' => [ + '#type' => 'inline_template', + '#template' => '{{ author }}{% if message %}

{{ message }}

{% endif %}', + '#context' => [ + 'author' => $this->t('!date by !username', [ + '!date' => $this->l($this->dateFormatter->format($revision->revision_timestamp->value, 'short'), new Url('entity.node.revision', array('node' => $node->id(), 'node_revision' => $vid))), + '!username' => \Drupal::service('renderer')->render($username), + ]), + 'message' => Xss::filter($revision->revision_log->value), + ], + ]]; if ($revert_permission) { $links['revert'] = array( diff --git a/core/modules/node/src/Tests/NodeRevisionsUiTest.php b/core/modules/node/src/Tests/NodeRevisionsUiTest.php index 7095873..daa4165 100644 --- a/core/modules/node/src/Tests/NodeRevisionsUiTest.php +++ b/core/modules/node/src/Tests/NodeRevisionsUiTest.php @@ -20,12 +20,12 @@ class NodeRevisionsUiTest extends NodeTestBase { /** - * Web user. + * @var \Drupal\user\Entity\User */ protected $webUser1; /** - * Web user. + * @var \Drupal\user\Entity\User */ protected $webUser2; @@ -129,7 +129,6 @@ function testNodeRevisionDoubleEscapeFix() { $this->drupalGet('node/' . $node->id() . '/revisions'); - $old_revision_message = t('!date by !username', array( '!date' => \Drupal::l(format_date($nodes[0]->revision_timestamp->value, 'short'), new Url('entity.node.revision', array('node' => $nodes[0]->id(), 'node_revision' => $nodes[0]->getRevisionId()))), '!username' => $web_user,