From 425726d96b982f760b0af2b0d7b6cb2d3edea909 Mon Sep 17 00:00:00 2001 From: Thom Wiggers Date: Thu, 9 Nov 2023 19:01:18 +0100 Subject: [PATCH] feat: support Hugo v0.120 - fix display of addresses Add support for breaking changes in Hugo v0.120.0 The delimiters got escaped by Hugo v0.120 See #3012 Close #3016 --- .../layouts/partials/functions/get_address.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/blox-bootstrap/layouts/partials/functions/get_address.html b/modules/blox-bootstrap/layouts/partials/functions/get_address.html index 4d97a119..ed311c77 100644 --- a/modules/blox-bootstrap/layouts/partials/functions/get_address.html +++ b/modules/blox-bootstrap/layouts/partials/functions/get_address.html @@ -13,11 +13,11 @@ {{ $address_display := slice }} {{ range $k, $v := $format.order }} - {{ if eq $v "street" | and $address.street }}{{$address_display = $address_display | append $address.street | append (index $format.delimiters $k | default "") }}{{end}} - {{ if eq $v "city" | and $address.city }}{{$address_display = $address_display | append $address.city | append (index $format.delimiters $k | default "") }}{{end}} - {{ if eq $v "region" | and $address.region }}{{$address_display = $address_display | append $address.region | append (index $format.delimiters $k | default "") }}{{end}} - {{ if eq $v "postcode" | and $address.postcode }}{{$address_display = $address_display | append $address.postcode | append (index $format.delimiters $k | default "") }}{{end}} - {{ if eq $v "country" | and $address.country }}{{$address_display = $address_display | append $address.country | append (index $format.delimiters $k | default "") }}{{end}} + {{ if eq $v "street" | and $address.street }}{{$address_display = $address_display | append (transform.HTMLEscape $address.street) | append (index $format.delimiters $k | default "") }}{{end}} + {{ if eq $v "city" | and $address.city }}{{$address_display = $address_display | append (transform.HTMLEscape $address.city) | append (index $format.delimiters $k | default "") }}{{end}} + {{ if eq $v "region" | and $address.region }}{{$address_display = $address_display | append (transform.HTMLEscape $address.region) | append (index $format.delimiters $k | default "") }}{{end}} + {{ if eq $v "postcode" | and $address.postcode }}{{$address_display = $address_display | append (transform.HTMLEscape $address.postcode) | append (index $format.delimiters $k | default "") }}{{end}} + {{ if eq $v "country" | and $address.country }}{{$address_display = $address_display | append (transform.HTMLEscape $address.country) | append (index $format.delimiters $k | default "") }}{{end}} {{end}} -{{ return (delimit $address_display "") }} +{{ return safeHTML (delimit $address_display "") }}