From 12a068a9d79599bc8b729d542a33a6efa54c2edf Mon Sep 17 00:00:00 2001
From: Justin Freeman <justin@agileware.com.au>
Date: Thu, 23 Jun 2022 15:05:08 +1000
Subject: [PATCH] CIVICRM-2004 CiviCRM Personal Campaign Pages (PCP),
 incorrectly display "Don't list my contribution in the honor roll" even if
 the Contribution Honour Roll feature is not enabled or the user has opted out
 of the Honour Roll

---
 .../Contribute/Form/Contribution/Confirm.tpl  | 28 ++++++++-----------
 .../Contribute/Form/Contribution/ThankYou.tpl | 22 ++++++---------
 .../CRM/Event/Form/Registration/Confirm.tpl   | 26 ++++++++---------
 3 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
index 3bfd864ea8..1beb28c2fe 100644
--- a/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Confirm.tpl
@@ -182,29 +182,25 @@
     </fieldset>
   {/if}
 
-  {if $pcpBlock}
+  {if $pcpBlock && $pcp_display_in_roll}
     <div class="crm-group pcp_display-group">
       <div class="header-dark">
         {ts}Contribution Honor Roll{/ts}
       </div>
       <div class="display-block">
-        {if $pcp_display_in_roll}
-          {ts}List my contribution{/ts}
-          {if $pcp_is_anonymous}
-            <strong>{ts}anonymously{/ts}.</strong>
+        {ts}List my contribution{/ts}
+        {if $pcp_is_anonymous}
+          <strong>{ts}anonymously{/ts}.</strong>
+        {else}
+          {ts}under the name{/ts}:
+          <strong>{$pcp_roll_nickname}</strong>
+          <br/>
+          {if $pcp_personal_note}
+            {ts}With the personal note{/ts}:
+            <strong>{$pcp_personal_note}</strong>
           {else}
-            {ts}under the name{/ts}:
-            <strong>{$pcp_roll_nickname}</strong>
-            <br/>
-            {if $pcp_personal_note}
-              {ts}With the personal note{/ts}:
-              <strong>{$pcp_personal_note}</strong>
-            {else}
-              <strong>{ts}With no personal note{/ts}</strong>
-            {/if}
+            <strong>{ts}With no personal note{/ts}</strong>
           {/if}
-        {else}
-          {ts}Don't list my contribution in the honor roll.{/ts}
         {/if}
         <br/>
       </div>
diff --git a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
index 3e638d8aac..c9ac6090e0 100644
--- a/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/ThankYou.tpl
@@ -215,26 +215,22 @@
     </fieldset>
   {/if}
 
-  {if $pcpBlock}
+  {if $pcpBlock && $pcp_display_in_roll}
     <div class="crm-group pcp_display-group">
       <div class="header-dark">
         {ts}Contribution Honor Roll{/ts}
       </div>
       <div class="display-block">
-        {if $pcp_display_in_roll}
-          {ts}List my contribution{/ts}
-          {if $pcp_is_anonymous}
-            <strong>{ts}anonymously{/ts}.</strong>
+        {ts}List my contribution{/ts}
+        {if $pcp_is_anonymous}
+          <strong>{ts}anonymously{/ts}.</strong>
+        {else}
+          {ts}under the name{/ts}: <strong>{$pcp_roll_nickname}</strong><br/>
+          {if $pcp_personal_note}
+            {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
           {else}
-            {ts}under the name{/ts}: <strong>{$pcp_roll_nickname}</strong><br/>
-            {if $pcp_personal_note}
-              {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
-            {else}
-              <strong>{ts}With no personal note{/ts}</strong>
-            {/if}
+            <strong>{ts}With no personal note{/ts}</strong>
           {/if}
-        {else}
-          {ts}Don't list my contribution in the honor roll.{/ts}
         {/if}
         <br />
       </div>
diff --git a/templates/CRM/Event/Form/Registration/Confirm.tpl b/templates/CRM/Event/Form/Registration/Confirm.tpl
index 862728aa97..20fa9774f0 100644
--- a/templates/CRM/Event/Form/Registration/Confirm.tpl
+++ b/templates/CRM/Event/Form/Registration/Confirm.tpl
@@ -55,28 +55,24 @@
         </div>
     </div>
 
-    {if $pcpBlock}
+    {if $pcpBlock && $pcp_display_in_roll}
     <div class="crm-group pcp_display-group">
         <div class="header-dark">
            {ts}Contribution Honor Roll{/ts}
         </div>
         <div class="display-block">
-            {if $pcp_display_in_roll}
-                {ts}List my contribution{/ts}
-                {if $pcp_is_anonymous}
-                    <strong>{ts}anonymously{/ts}.</strong>
-                {else}
+          {ts}List my contribution{/ts}
+          {if $pcp_is_anonymous}
+              <strong>{ts}anonymously{/ts}.</strong>
+          {else}
             {ts}under the name{/ts}: <strong>{$pcp_roll_nickname}</strong><br/>
-                    {if $pcp_personal_note}
-                        {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
-                    {else}
-                     <strong>{ts}With no personal note{/ts}</strong>
-                     {/if}
-                {/if}
+            {if $pcp_personal_note}
+                {ts}With the personal note{/ts}: <strong>{$pcp_personal_note}</strong>
             {else}
-                {ts}Don't list my contribution in the honor roll.{/ts}
-            {/if}
-            <br />
+             <strong>{ts}With no personal note{/ts}</strong>
+             {/if}
+          {/if}
+          <br />
         </div>
     </div>
     {/if}
-- 
2.25.1