CRM-18508: Display State/Province in event address in registration emails (handled...

[civicrm-core.git] / xml / templates / message_templates / event_registration_receipt_text.tpl

diff --git a/xml/templates/message_templates/event_registration_receipt_text.tpl b/xml/templates/message_templates/event_registration_receipt_text.tpl
index 9620798772d80e3304c8bb5d7fd6986850bc17bb..695b53d60432e6eea04eda09425abe997d2baf8c 100644 (file)
--- a/xml/templates/message_templates/event_registration_receipt_text.tpl
+++ b/xml/templates/message_templates/event_registration_receipt_text.tpl
@@ -34,21 +34,7 @@ Dear {contact.display_name},
 {foreach from=$line_items item=line_item}
 {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})
 {if $line_item.event->is_show_location}
-  {if $line_item.location.address.1.name}
-    {$line_item.location.address.1.name}
-  {/if}
-  {if $line_item.location.address.1.street_address}
-    {$line_item.location.address.1.street_address}
-  {/if}
-  {if $line_item.location.address.1.supplemental_address_1}
-    {$line_item.location.address.1.supplemental_address_1}
-  {/if}
-  {if $line_item.location.address.1.supplemental_address_2}
-    {$line_item.location.address.1.supplemental_address_2}
-  {/if}
-  {if $line_item.location.address.1.city}
-    {$line_item.location.address.1.city}, {$line_item.location.address.1.state_province} {$line_item.location.address.1.postal_code}
-  {/if}
+  {$line_item.location.address.1.display|strip_tags:false}
 {/if}{*End of isShowLocation condition*}
 {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"}