X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fmodules%2Fcontrib%2Fdiff%2Fsrc%2FDiffLayoutBase.php;fp=web%2Fmodules%2Fcontrib%2Fdiff%2Fsrc%2FDiffLayoutBase.php;h=dcb20f03986b0de503932dd71e53a5360be2ba9f;hb=059867c3f96750652c80f39e44c442a58c2549ee;hp=85c423a057e334341bc4bdde826b3e7102f2e1d7;hpb=f8fc16ae6b862bef59baaad5d051dd37b7ff11b2;p=yaffs-website

diff --git a/web/modules/contrib/diff/src/DiffLayoutBase.php b/web/modules/contrib/diff/src/DiffLayoutBase.php
index 85c423a05..dcb20f039 100644
--- a/web/modules/contrib/diff/src/DiffLayoutBase.php
+++ b/web/modules/contrib/diff/src/DiffLayoutBase.php
@@ -106,14 +106,9 @@ abstract class DiffLayoutBase extends PluginBase implements DiffLayoutInterface,
    *   Header link for a revision in the table.
    */
   protected function buildRevisionLink(ContentEntityInterface $revision) {
-    $entity_type_id = $revision->getEntityTypeId();
     if ($revision instanceof RevisionLogInterface) {
       $revision_date = $this->date->format($revision->getRevisionCreationTime(), 'short');
-      $route_name = $entity_type_id != 'node' ? "entity.$entity_type_id.revisions_diff" : 'entity.node.revision';
-      $revision_link = Link::fromTextAndUrl($revision_date, Url::fromRoute($route_name, [
-        $entity_type_id => $revision->id(),
-        $entity_type_id . '_revision' => $revision->getRevisionId(),
-      ]))->toString();
+      $revision_link = Link::fromTextAndUrl($revision_date, $revision->toUrl('revision'))->toString();
     }
     else {
       $revision_link = Link::fromTextAndUrl($revision->label(), $revision->toUrl('revision'))
@@ -151,7 +146,7 @@ abstract class DiffLayoutBase extends PluginBase implements DiffLayoutInterface,
           '#wrapper_attributes' => ['class' => 'diff-revision'],
           'items' => [
             '#prefix' => '<div class="diff-revision__items">',
-            '#suffix' => '</div></div>',
+            '#suffix' => '</div>',
             'right_revision' => $right_revision,
             'left_revision' => $left_revision,
           ],
@@ -170,19 +165,14 @@ abstract class DiffLayoutBase extends PluginBase implements DiffLayoutInterface,
    *   Revision data about author, creation date and log.
    */
   protected function buildRevisionData(ContentEntityInterface $revision) {
-    $entity_type_id = $revision->getEntityTypeId();
     if ($revision instanceof RevisionLogInterface) {
       $revision_log = Xss::filter($revision->getRevisionLogMessage());
       $user_id = $revision->getRevisionUserId();
-      $route_name = $entity_type_id != 'node' ? "entity.$entity_type_id.revisions_diff" : 'entity.node.revision';
 
       $revision_link['date'] = [
         '#type' => 'link',
         '#title' => $this->date->format($revision->getRevisionCreationTime(), 'short'),
-        '#url' => Url::fromRoute($route_name, [
-          $entity_type_id => $revision->id(),
-          $entity_type_id . '_revision' => $revision->getRevisionId(),
-        ]),
+        '#url' => $revision->toUrl('revision'),
         '#prefix' => '<div class="diff-revision__item diff-revision__item-date">',
         '#suffix' => '</div>',
       ];