Merge pull request #10080 from agileware/CRM-20360

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

diff --git a/xml/templates/message_templates/event_registration_receipt_html.tpl b/xml/templates/message_templates/event_registration_receipt_html.tpl
index 56159a7aea563d9e7633a41514758ceccd79c022..3436a1903486a05e25bda1a94936b708f1cbb498 100644 (file)
--- a/xml/templates/message_templates/event_registration_receipt_html.tpl
+++ b/xml/templates/message_templates/event_registration_receipt_html.tpl
@@ -93,21 +93,7 @@
     <td style="width: 220px">
       {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})<br />
       {if $line_item.event->is_show_location}
-        {if $line_item.location.address.1.name}
-    {$line_item.location.address.1.name}<br />
-        {/if}
-        {if $line_item.location.address.1.street_address}
-    {$line_item.location.address.1.street_address}<br />
-        {/if}
-        {if $line_item.location.address.1.supplemental_address_1}
-    {$line_item.location.address.1.supplemental_address_1}<br />
-        {/if}
-        {if $line_item.location.address.1.supplemental_address_2}
-    {$line_item.location.address.1.supplemental_address_2}<br />
-        {/if}
-        {if $line_item.location.address.1.city}
-    {$line_item.location.address.1.city}, {$line_item.location.address.1.state_province} {$location.address.1.postal_code}
-        {/if}
+        {$line_item.location.address.1.display|nl2br}
       {/if}{*End of isShowLocation condition*}<br /><br />
       {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"}
     </td>