From a050cd73596e7749c73442ca963614c12fe9c191 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Thu, 11 Nov 2021 09:46:11 +1300
Subject: [PATCH] Ensure gender_display is always set

Always add it, rather than checking if it is assiged in the template
---
 CRM/Contact/Page/View/Summary.php                  | 4 +---
 templates/CRM/Contact/Page/Inline/Demographics.tpl | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/CRM/Contact/Page/View/Summary.php b/CRM/Contact/Page/View/Summary.php
index b28cfcfa46..a59de8a3a2 100644
--- a/CRM/Contact/Page/View/Summary.php
+++ b/CRM/Contact/Page/View/Summary.php
@@ -183,9 +183,7 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
       }
     }
 
-    if (!empty($defaults['gender_id'])) {
-      $defaults['gender_display'] = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', 'gender_id', $defaults['gender_id']);
-    }
+    $defaults['gender_display'] = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', 'gender_id', $defaults['gender_id'] ?? NULL);
 
     $communicationStyle = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'communication_style_id');
     if (!empty($communicationStyle)) {
diff --git a/templates/CRM/Contact/Page/Inline/Demographics.tpl b/templates/CRM/Contact/Page/Inline/Demographics.tpl
index e7e2ce5526..7951f284cf 100644
--- a/templates/CRM/Contact/Page/Inline/Demographics.tpl
+++ b/templates/CRM/Contact/Page/Inline/Demographics.tpl
@@ -16,7 +16,7 @@
     {/if}
     <div class="crm-summary-row">
       <div class="crm-label">{ts}Gender{/ts}</div>
-      <div class="crm-content crm-contact-gender_display">{if !empty($gender_display)}{$gender_display}{/if}</div>
+      <div class="crm-content crm-contact-gender_display">$gender_display}</div>
     </div>
 
     <div class="crm-summary-row">
-- 
2.25.1