diff -u b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php --- b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php +++ b/core/lib/Drupal/Core/Entity/Controller/EntityViewController.php @@ -69,19 +69,26 @@ // correctly (e.g. RDFa, in-place editing). if ($entity instanceof FieldableEntityInterface) { $label_field = $entity->getEntityType()->getKey('label'); - $render = $page[$label_field]; - // The title formatter can provide markup for use in the page title - // that's different from that used when rendering the field normally. - if (isset($render['#page_title']) && $render['#page_title']) { - unset($render[0]); - $render += $render['#page_title']; - } - $page['#title'] = $this->renderer->render($render); + if (isset($page[$label_field])) { + if (isset($page[$label_field]['#page_title'])) { + // The title formatter has provided markup for use in the page title + // that's different from that used when rendering the field normally. + if ($page[$label_field]['#page_title']) { + $page[$label_field] = $page[$label_field]['#page_title'] + $page[$label_field]; + } + else { + $page['#title'] = ''; + $skip_render = TRUE; + } + } - // The title formatter can choose to hide the title from the list - // of rendered fields if it has been used as a title. - if (isset($render['#page_title_hide']) && $render['#page_title_hide']) { - $page[$label_field]['#printed'] = TRUE; + if (!isset($skip_render)) { + $page['#title'] = $this->renderer->render($page[$label_field]); + } + } + elseif ($entity->hasField($label_field)) { + // The title field exists and has been explicitly hidden. + $page['#title'] = ''; } } return $page;