Merge branch 'CRM-20460' into CRM-20460-4.7

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

diff --git a/xml/templates/message_templates/participant_cancelled_text.tpl b/xml/templates/message_templates/participant_cancelled_text.tpl
index f79abd2c02b879874df2ba6af0c5196a5f6b6341..b4430b33d19437bf5f9f81541aec0df07298df97 100644 (file)
--- a/xml/templates/message_templates/participant_cancelled_text.tpl
+++ b/xml/templates/message_templates/participant_cancelled_text.tpl
@@ -13,19 +13,7 @@
 {ts}Participant Role{/ts}: {$participant.role}
 
 {if $isShowLocation}
-{if $event.location.address.1.name}
-
-{$event.location.address.1.name}
-{/if}
-{if $event.location.address.1.street_address}{$event.location.address.1.street_address}
-{/if}
-{if $event.location.address.1.supplemental_address_1}{$event.location.address.1.supplemental_address_1}
-{/if}
-{if $event.location.address.1.supplemental_address_2}{$event.location.address.1.supplemental_address_2}
-{/if}
-{if $event.location.address.1.city}{$event.location.address.1.city} {$event.location.address.1.postal_code}{if $event.location.address.1.postal_code_suffix} - {$event.location.address.1.postal_code_suffix}{/if}
-{/if}
-
+{$event.location.address.1.display|strip_tags:false}
 {/if}{*End of isShowLocation condition*}
 
 {if $event.location.phone.1.phone || $event.location.email.1.email}