X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=xml%2Ftemplates%2Fmessage_templates%2Fparticipant_expired_html.tpl;h=a11ff72685cfede07dcb6f603e31f72184dd7e6f;hb=060625d681a21cfc22a8771826d2b1c6a3ce6c94;hp=ca2621f9e5cec7bdb69d51b9fb55c1e222fb2d69;hpb=53128a92d19ec8f0526b48a4a0c044bb0d671d84;p=civicrm-core.git

diff --git a/xml/templates/message_templates/participant_expired_html.tpl b/xml/templates/message_templates/participant_expired_html.tpl
index ca2621f9e5..a11ff72685 100644
--- a/xml/templates/message_templates/participant_expired_html.tpl
+++ b/xml/templates/message_templates/participant_expired_html.tpl
@@ -54,24 +54,7 @@ or want to inquire about reinstating your registration for this event.{/ts}</p>
      {if $isShowLocation}
       <tr>
        <td colspan="2" {$valueStyle}>
-        {if $event.location.address.1.name}
-         {$event.location.address.1.name}<br />
-        {/if}
-        {if $event.location.address.1.street_address}
-         {$event.location.address.1.street_address}<br />
-        {/if}
-        {if $event.location.address.1.supplemental_address_1}
-         {$event.location.address.1.supplemental_address_1}<br />
-        {/if}
-        {if $event.location.address.1.supplemental_address_2}
-         {$event.location.address.1.supplemental_address_2}<br />
-        {/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|nl2br}
        </td>
       </tr>
      {/if}