From 9bdef2ac8f620c51e359aefa166ff4c407bcc69f Mon Sep 17 00:00:00 2001 From: xjm Date: Tue, 15 Feb 2022 14:26:24 -0600 Subject: [PATCH] SA-CORE-2022-004 by samuel.mortenson, xjm, nod_, effulgentsia, phenaproxima, mcdruid, Wim Leers, tedbow, longwave, dww, larowlan, pandaski (cherry picked from commit 0ea69dc824f56f1cbeb38103e3fa4718832cc109) --- core/modules/quickedit/src/MetadataGenerator.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/modules/quickedit/src/MetadataGenerator.php b/core/modules/quickedit/src/MetadataGenerator.php index 174726fe132..a071512b5d6 100644 --- a/core/modules/quickedit/src/MetadataGenerator.php +++ b/core/modules/quickedit/src/MetadataGenerator.php @@ -5,6 +5,7 @@ namespace Drupal\quickedit; use Drupal\Component\Plugin\PluginManagerInterface; use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Field\FieldItemListInterface; +use Drupal\Core\StringTranslation\TranslatableMarkup; use Drupal\quickedit\Access\QuickEditEntityFieldAccessCheckInterface; use Drupal\Core\Entity\Entity\EntityViewDisplay; @@ -55,7 +56,10 @@ class MetadataGenerator implements MetadataGeneratorInterface { */ public function generateEntityMetadata(EntityInterface $entity) { return [ - 'label' => $entity->label(), + 'label' => $entity->access('view label') ? $entity->label() : new TranslatableMarkup('@label @id', [ + '@label' => $entity->getEntityType()->getSingularLabel(), + '@id' => $entity->id() + ]) ]; }