diff --git a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php index 2598b55b6fb8..115ae5398f7d 100644 --- a/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php +++ b/core/modules/link/src/Plugin/Field/FieldFormatter/LinkSeparateFormatter.php @@ -63,7 +63,7 @@ class LinkSeparateFormatter extends LinkFormatter { } $url_title = $url->toString(); if (!empty($settings['trim_length'])) { - $link_title = Unicode::truncate($link_title, $settings['trim_length'], FALSE, TRUE); + $link_title = $link_title !== NULL ? Unicode::truncate($link_title, $settings['trim_length'], FALSE, TRUE) : NULL; $url_title = Unicode::truncate($url_title, $settings['trim_length'], FALSE, TRUE); } diff --git a/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php index 1b186a6e04a1..fe45b946ef65 100644 --- a/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php +++ b/core/modules/menu_link_content/src/Plugin/migrate/source/MenuLink.php @@ -111,7 +111,10 @@ class MenuLink extends DrupalSqlBase { } $row->setSourceProperty('options', unserialize($row->getSourceProperty('options'))); $row->setSourceProperty('enabled', !$row->getSourceProperty('hidden')); - $row->setSourceProperty('description', Unicode::truncate($row->getSourceProperty('options/attributes/title'), 255)); + $description = $row->getSourceProperty('options/attributes/title'); + if ($description !== NULL) { + $row->setSourceProperty('description', Unicode::truncate($description, 255)); + } return parent::prepareRow($row); }