From 09163e8ac4589d24d7e49df1aa4069da54fcb277 Mon Sep 17 00:00:00 2001
From: Dave Greenberg <dave@civicrm.org>
Date: Wed, 4 Dec 2013 16:32:47 -0800
Subject: [PATCH] CRM-13890 - Cleanup message template text. Update obsolete
 wiki reference in Legacy.php.

----------------------------------------
* CRM-13890: Participant status is not being passed to message template for online event registration
  http://issues.civicrm.org/jira/browse/CRM-13890
---
 .../message_templates/event_online_receipt_html.tpl             | 2 +-
 .../message_templates/event_online_receipt_text.tpl             | 2 +-
 CRM/Upgrade/Incremental/Legacy.php                              | 2 +-
 CRM/Upgrade/Incremental/php/FourFour.php                        | 2 +-
 xml/templates/message_templates/event_online_receipt_html.tpl   | 2 +-
 xml/templates/message_templates/event_online_receipt_text.tpl   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_html.tpl b/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_html.tpl
index 22098fc22c..c519669e4c 100644
--- a/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_html.tpl
+++ b/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_html.tpl
@@ -27,7 +27,7 @@
      <p>{$event.confirm_email_text|htmlize}</p>
 
     {else}
-  <p>Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to <strong>{if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}</strong> for the following:</p>
+  <p>Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to <strong>{if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}</strong>.</p>
 
     {/if}
 
diff --git a/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_text.tpl b/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_text.tpl
index e373d2b320..726b3f3e7a 100644
--- a/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_text.tpl
+++ b/CRM/Upgrade/4.4.3.msg_template/message_templates/event_online_receipt_text.tpl
@@ -4,7 +4,7 @@ Dear {contact.display_name},
 {$event.confirm_email_text}
 
 {else}
-Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if} for the following:
+Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}.
 
 {/if}
 
diff --git a/CRM/Upgrade/Incremental/Legacy.php b/CRM/Upgrade/Incremental/Legacy.php
index a9352edb62..506f8feeac 100644
--- a/CRM/Upgrade/Incremental/Legacy.php
+++ b/CRM/Upgrade/Incremental/Legacy.php
@@ -175,7 +175,7 @@ SELECT  id
     if ($flag == TRUE) {
       $html = "<ul>" . $html . "<ul>";
 
-      $message .= '<br />' . ts("The default copies of the message templates listed below will be updated to handle new features. Your installation has customized versions of these message templates, and you will need to apply the updates manually after running this upgrade. <a href='%1' style='color:white; text-decoration:underline; font-weight:bold;' target='_blank'>Click here</a> for detailed instructions. %2", array(1 => 'http://wiki.civicrm.org/confluence/display/CRMDOC40/Message+Templates#MessageTemplates-UpgradesandCustomizedSystemWorkflowTemplates', 2 => $html));
+      $message .= '<br />' . ts("The default copies of the message templates listed below will be updated to handle new features. Your installation has customized versions of these message templates, and you will need to apply the updates manually after running this upgrade. <a href='%1' style='color:white; text-decoration:underline; font-weight:bold;' target='_blank'>Click here</a> for detailed instructions. %2", array(1 => 'http://wiki.civicrm.org/confluence/display/CRMDOC/Message+Templates#MessageTemplates-UpgradesandCustomizedSystemWorkflowTemplates', 2 => $html));
     }
   }
 
diff --git a/CRM/Upgrade/Incremental/php/FourFour.php b/CRM/Upgrade/Incremental/php/FourFour.php
index f571143699..288e34f797 100644
--- a/CRM/Upgrade/Incremental/php/FourFour.php
+++ b/CRM/Upgrade/Incremental/php/FourFour.php
@@ -66,7 +66,7 @@ class CRM_Upgrade_Incremental_php_FourFour {
       }
     }
     if ($rev == '4.4.3') {
-      $postUpgradeMessage .= '<br />' . ts('Default versions of the following System Workflow Message Templates have been modified to handle new functionality: <ul><li>Events - Registration Confirmation and Receipt (on-line)</li></ul> If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).');
+      $postUpgradeMessage .= '<br /><br />' . ts('Default versions of the following System Workflow Message Templates have been modified to handle new functionality: <ul><li>Events - Registration Confirmation and Receipt (on-line)</li></ul> If you have modified these templates, please review the new default versions and implement updates as needed to your copies (Administer > Communications > Message Templates > System Workflow Messages).');
     }
   }
 
diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl
index 22098fc22c..c519669e4c 100644
--- a/xml/templates/message_templates/event_online_receipt_html.tpl
+++ b/xml/templates/message_templates/event_online_receipt_html.tpl
@@ -27,7 +27,7 @@
      <p>{$event.confirm_email_text|htmlize}</p>
 
     {else}
-  <p>Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to <strong>{if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}</strong> for the following:</p>
+  <p>Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to <strong>{if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}</strong>.</p>
 
     {/if}
 
diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl
index e373d2b320..726b3f3e7a 100644
--- a/xml/templates/message_templates/event_online_receipt_text.tpl
+++ b/xml/templates/message_templates/event_online_receipt_text.tpl
@@ -4,7 +4,7 @@ Dear {contact.display_name},
 {$event.confirm_email_text}
 
 {else}
-Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if} for the following:
+Thank you for your participation.  This letter is a confirmation that your registration has been received and your status has been updated to {if $participant_status}{$participant_status}{else}{if $isOnWaitlist}waitlisted{else}registered{/if}{/if}.
 
 {/if}
 
-- 
2.25.1