diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkUrlFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkUrlFormatter.php index 82781d5..3fd48ac 100644 --- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkUrlFormatter.php +++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkUrlFormatter.php @@ -1,23 +1,13 @@ $item) { $link_url = $this->buildUrl($item); - // Generate external URL without cacheable metadata or internal URL and - // collect cacheable metadata. - if ($link_url->isExternal()) { - $url = $link_url->toString(FALSE); - } - else { - $generated_url = $link_url->toString(TRUE); - $url = $generated_url->getGeneratedUrl(); - $cacheable_metadata = CacheableMetadata::createFromObject($generated_url); - } + // Collect cacheable metadata. + $generated_url = $link_url->toString(TRUE); + $url = $generated_url->getGeneratedUrl(); + $cacheable_metadata = CacheableMetadata::createFromObject($generated_url); $elements[$delta] = ['#plain_text' => UrlHelper::stripDangerousProtocols($url)]; - if ($cacheable_metadata) { - $cacheable_metadata->applyTo($elements[$delta]); - } + $cacheable_metadata->applyTo($elements[$delta]); } return $elements; }