diff --git a/core/profiles/demo_umami/themes/umami/js/components/navigation/menu-main/menu-main.es6.js b/core/profiles/demo_umami/themes/umami/js/components/navigation/menu-main/menu-main.es6.js index 38d50d8cda..bd781907b7 100644 --- a/core/profiles/demo_umami/themes/umami/js/components/navigation/menu-main/menu-main.es6.js +++ b/core/profiles/demo_umami/themes/umami/js/components/navigation/menu-main/menu-main.es6.js @@ -1,6 +1,6 @@ /** * @file - * This file is used to add any javascrip that is needed for the main menu. + * This file is used to add any javascript that is needed for the main menu. */ (function () { diff --git a/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig b/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig index 7059e79dd4..94296678c3 100644 --- a/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig +++ b/core/profiles/demo_umami/themes/umami/templates/components/banner-block/block--bundle--banner-block.html.twig @@ -45,9 +45,7 @@ {% block content %} {{ content.field_banner_image }}
- {{ content.field_title }} - {{ content.field_summary }} - {{ content.field_content_link }} + {{ content }}
{% endblock %} diff --git a/core/profiles/demo_umami/themes/umami/umami.theme b/core/profiles/demo_umami/themes/umami/umami.theme index 027654f0a5..69829548c4 100644 --- a/core/profiles/demo_umami/themes/umami/umami.theme +++ b/core/profiles/demo_umami/themes/umami/umami.theme @@ -69,15 +69,15 @@ function umami_preprocess_breadcrumb(&$variables) { // give us a breadcrumb of Home >> Search >> Search. // @see https://www.drupal.org/project/drupal/issues/2359901 // @see https://www.drupal.org/project/drupal/issues/2403359 - if (($entity = $request->attributes->get('entity')) && $entity->getEntityType()->id() == 'search_page') { + if (($entity = $request->attributes->get('entity')) && $entity->getEntityTypeId() === 'search_page') { $variables['current_page_title'] = $entity->getPlugin()->suggestedTitle(); } else { $variables['current_page_title'] = \Drupal::service('title_resolver')->getTitle($request, $route); } } - // Since we are printing the 'Current Page Title', set the cache to match - // the URL cache. If we don't, then we might end up with something like + // Since we are printing the 'Current Page Title', add the URL cache context. + // If we don't, then we might end up with something like // "Home > Articles" on the Recipes page, which should read "Home > Recipes". $variables['#cache']['contexts'][] = 'url'; }