From 6b5cc136fb223f1c990fa7ee04588c388a60dde4 Mon Sep 17 00:00:00 2001 From: Mari Nez Date: Tue, 17 Dec 2024 12:54:11 -0600 Subject: [PATCH 1/2] fix(shs-5988): empty headings on postcards without title --- .../hs_layouts/patterns/vertical-card/vertical-card.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docroot/modules/humsci/hs_layouts/patterns/vertical-card/vertical-card.html.twig b/docroot/modules/humsci/hs_layouts/patterns/vertical-card/vertical-card.html.twig index fd190ec4bb..d5274244b8 100644 --- a/docroot/modules/humsci/hs_layouts/patterns/vertical-card/vertical-card.html.twig +++ b/docroot/modules/humsci/hs_layouts/patterns/vertical-card/vertical-card.html.twig @@ -15,7 +15,7 @@
{{ category }}
{% endif %} - {% if title %} + {% if title|render %}
{% set title_content %} {% if href %} From 6f9b3f49df67e8674a99da4ab680500ad34a2f9c Mon Sep 17 00:00:00 2001 From: Mari Nez Date: Tue, 17 Dec 2024 13:18:02 -0600 Subject: [PATCH 2/2] fix(shs-5988): empty headings on postcards without title --- docroot/modules/humsci/hs_layouts/hs_layouts.module | 3 ++- .../hs_layouts/patterns/vertical-card/vertical-card.html.twig | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docroot/modules/humsci/hs_layouts/hs_layouts.module b/docroot/modules/humsci/hs_layouts/hs_layouts.module index 463e1dd9c9..05a3d374bf 100644 --- a/docroot/modules/humsci/hs_layouts/hs_layouts.module +++ b/docroot/modules/humsci/hs_layouts/hs_layouts.module @@ -182,9 +182,10 @@ function _hs_layouts_make_title_the_link(&$variables) { $variables['href'] = $variables['href'] ?? htmlspecialchars_decode(trim(strip_tags($renderer->renderInIsolation($variables['button'])))); } } + if (!empty($variables['title'])) { $title = is_array($variables['title']) ? $renderer->renderInIsolation($variables['title']) : $variables['title']; - $variables['title'] = ['#markup' => trim(strip_tags($title))]; + $variables['title'] = $title ?? ['#markup' => trim(strip_tags($title))]; } } diff --git a/docroot/modules/humsci/hs_layouts/patterns/vertical-card/vertical-card.html.twig b/docroot/modules/humsci/hs_layouts/patterns/vertical-card/vertical-card.html.twig index d5274244b8..fd190ec4bb 100644 --- a/docroot/modules/humsci/hs_layouts/patterns/vertical-card/vertical-card.html.twig +++ b/docroot/modules/humsci/hs_layouts/patterns/vertical-card/vertical-card.html.twig @@ -15,7 +15,7 @@
{{ category }}
{% endif %} - {% if title|render %} + {% if title %}
{% set title_content %} {% if href %}