From fc2e1993cc0577b831537c77795cdd6fdcffba3d Mon Sep 17 00:00:00 2001
From: Samuel Vanhove <samuel@symbiotic.coop>
Date: Mon, 29 Mar 2021 12:06:07 -0400
Subject: [PATCH] dev/core#527 use public title for on behalf profile and
 confirm/thank you pages

---
 CRM/Contribute/BAO/ContributionPage.php | 2 +-
 CRM/Event/BAO/Event.php                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CRM/Contribute/BAO/ContributionPage.php b/CRM/Contribute/BAO/ContributionPage.php
index 271d0e70a8..9ce2481d5f 100644
--- a/CRM/Contribute/BAO/ContributionPage.php
+++ b/CRM/Contribute/BAO/ContributionPage.php
@@ -483,7 +483,7 @@ class CRM_Contribute_BAO_ContributionPage extends CRM_Contribute_DAO_Contributio
         $fields = CRM_Core_BAO_UFGroup::getFields($gid, FALSE, CRM_Core_Action::VIEW, NULL, NULL, FALSE, NULL, FALSE, NULL, CRM_Core_Permission::CREATE, NULL);
         foreach ($fields as $k => $v) {
           if (!$groupTitle) {
-            $groupTitle = $v['groupTitle'];
+            $groupTitle = !empty($v['groupDisplayTitle']) ? $v['groupDisplayTitle'] : $v['groupTitle'];
           }
           // suppress all file fields from display and formatting fields
           if (
diff --git a/CRM/Event/BAO/Event.php b/CRM/Event/BAO/Event.php
index 015b2e9660..0eb730187d 100644
--- a/CRM/Event/BAO/Event.php
+++ b/CRM/Event/BAO/Event.php
@@ -1320,7 +1320,7 @@ WHERE civicrm_event.is_active = 1
         $groupTitle = NULL;
         foreach ($fields as $k => $v) {
           if (!$groupTitle) {
-            $groupTitle = $v['groupTitle'];
+            $groupTitle = !empty($v['groupDisplayTitle']) ? $v['groupDisplayTitle'] : $v['groupTitle'];
           }
           // suppress all file fields from display
           if (
-- 
2.25.1