From e41394ecb66a6046869f5606d735d45c355ff55d Mon Sep 17 00:00:00 2001
From: Lee Rowlands <lee.rowlands@previousnext.com.au>
Date: Fri, 16 Jul 2021 09:00:22 +1000
Subject: [PATCH] Issue #2935654 by longwave, hctom: Use of undefined
 $languages variable in NodeListBuilder::buildRow()

---
 core/modules/node/src/NodeListBuilder.php | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/core/modules/node/src/NodeListBuilder.php b/core/modules/node/src/NodeListBuilder.php
index 22b900da876..ca8d12243e2 100644
--- a/core/modules/node/src/NodeListBuilder.php
+++ b/core/modules/node/src/NodeListBuilder.php
@@ -7,7 +7,6 @@ use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityListBuilder;
 use Drupal\Core\Entity\EntityStorageInterface;
 use Drupal\Core\Entity\EntityTypeInterface;
-use Drupal\Core\Language\LanguageInterface;
 use Drupal\Core\Routing\RedirectDestinationInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
@@ -95,16 +94,11 @@ class NodeListBuilder extends EntityListBuilder {
       '#theme' => 'mark',
       '#mark_type' => node_mark($entity->id(), $entity->getChangedTime()),
     ];
-    $langcode = $entity->language()->getId();
-    $uri = $entity->toUrl();
-    $options = $uri->getOptions();
-    $options += ($langcode != LanguageInterface::LANGCODE_NOT_SPECIFIED && isset($languages[$langcode]) ? ['language' => $languages[$langcode]] : []);
-    $uri->setOptions($options);
     $row['title']['data'] = [
       '#type' => 'link',
       '#title' => $entity->label(),
       '#suffix' => ' ' . \Drupal::service('renderer')->render($mark),
-      '#url' => $uri,
+      '#url' => $entity->toUrl(),
     ];
     $row['type'] = node_get_type_label($entity);
     $row['author']['data'] = [
@@ -115,7 +109,7 @@ class NodeListBuilder extends EntityListBuilder {
     $row['changed'] = $this->dateFormatter->format($entity->getChangedTime(), 'short');
     $language_manager = \Drupal::languageManager();
     if ($language_manager->isMultilingual()) {
-      $row['language_name'] = $language_manager->getLanguageName($langcode);
+      $row['language_name'] = $language_manager->getLanguageName($entity->language()->getId());
     }
     $row['operations']['data'] = $this->buildOperations($entity);
     return $row + parent::buildRow($entity);