From fa346b51d8529a26b813f1f0abb152cdb4828c09 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 18 Sep 2023 18:23:41 +1200
Subject: [PATCH] Consolicate Profile Preview with other profile code

---
 CRM/UF/Form/Preview.php           | 4 ++--
 templates/CRM/UF/Form/Preview.tpl | 9 +--------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/CRM/UF/Form/Preview.php b/CRM/UF/Form/Preview.php
index c1788f5be1..b3575af62f 100644
--- a/CRM/UF/Form/Preview.php
+++ b/CRM/UF/Form/Preview.php
@@ -48,7 +48,7 @@ class CRM_UF_Form_Preview extends CRM_UF_Form_AbstractPreview {
       }
       $name = $fieldDAO->field_name;
 
-      if ($fieldDAO->field_name == 'phone_and_ext') {
+      if ($fieldDAO->field_name === 'phone_and_ext') {
         $name = 'phone';
       }
 
@@ -85,7 +85,7 @@ class CRM_UF_Form_Preview extends CRM_UF_Form_AbstractPreview {
 
       $fieldArray[$name] = $fields[$name];
 
-      if ($fieldDAO->field_name == 'phone_and_ext') {
+      if ($fieldDAO->field_name === 'phone_and_ext') {
         $phoneExtField = str_replace('phone', 'phone_ext', $name);
         $fieldArray[$phoneExtField] = $fields[$phoneExtField];
       }
diff --git a/templates/CRM/UF/Form/Preview.tpl b/templates/CRM/UF/Form/Preview.tpl
index 3d78c9a733..4c7993f4ae 100644
--- a/templates/CRM/UF/Form/Preview.tpl
+++ b/templates/CRM/UF/Form/Preview.tpl
@@ -19,15 +19,8 @@
   {if $viewOnly}
   {* wrap in crm-container div so crm styles are used *}
     <div id="crm-container-inner" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
-    {include file="CRM/common/CMSUser.tpl"}
       {strip}
-        {if $help_pre && $action neq 4}<div class="messages help">{$help_pre}</div>{/if}
-        {assign var=zeroField value="Initial Non Existent Fieldset"}
-        {assign var=fieldset  value=$zeroField}
-        {include file="CRM/UF/Form/Fields.tpl" prefix=false mode=false hideFieldset=false}
-        {if $field.groupHelpPost}
-          <div class="messages help">{$field.groupHelpPost}</div>
-        {/if}
+        {include file="CRM/UF/Form/Block.tpl" prefix=false mode=false hideFieldset=false}
       {/strip}
     </div> {* end crm-container div *}
   {else}
-- 
2.25.1