Skip to content
Snippets Groups Projects
Commit a3ae66c3 authored by Matias Vessuri's avatar Matias Vessuri
Browse files

Issue #3413073: Remove tokens from labels if a replacement value cannot be generated

parent 49386cfe
No related branches found
No related tags found
1 merge request!1Issue #3413073: Remove tokens from labels if a replacement value cannot be generated
......@@ -48,7 +48,7 @@ class EntityAutocomplete extends EntityAutocompleteCore {
foreach ($condition as $k => $v) {
if ($k == $entity->bundle()) {
$label = ($entity->access('view label'))
? $token->replace($label_config_entity->getPattern(), [$entity->getEntityType()->id() => $entity])
? $token->replace($label_config_entity->getPattern(), [$entity->getEntityType()->id() => $entity], ['clear' => TRUE])
: t('- Restricted access -');
}
}
......@@ -57,7 +57,7 @@ class EntityAutocomplete extends EntityAutocompleteCore {
}
else {
$label = ($entity->access('view label'))
? $token->replace($label_config_entity->getPattern(), [$entity->getEntityType()->id() => $entity])
? $token->replace($label_config_entity->getPattern(), [$entity->getEntityType()->id() => $entity], ['clear' => TRUE])
: t('- Restricted access -');
}
......
......@@ -50,14 +50,14 @@ class EntityReferencePatternMatcher extends EntityAutocompleteMatcher {
if ($type == 'bundles') {
foreach ($condition as $k => $v) {
if ($k == $entity->bundle()) {
$label = $token->replace($label_config_entity->getPattern(), [$entity->getEntityType()->id() => $entity]);
$label = $token->replace($label_config_entity->getPattern(), [$entity->getEntityType()->id() => $entity], ['clear' => TRUE]);
}
}
}
}
}
else {
$label = $token->replace($label_config_entity->getPattern(), [$entity->getEntityType()->id() => $entity]);
$label = $token->replace($label_config_entity->getPattern(), [$entity->getEntityType()->id() => $entity], ['clear' => TRUE]);
}
// Just to be safe here we replace ([digital]) petterns so referenced ID could be extracted.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment