From 19ae60176cb4ab3aca02ef13e81e9ba0ec66b185 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 16 Oct 2020 02:00:16 +0200 Subject: [PATCH] Bug 26666: Fix line breaks in addresses displayed with AddressFormat French or German When Addressformat is set to French or German the addresses on the Details tab will display
in plain text. This is because a TT variable is used for adding line breaks that is either set to
or "". Then this variable is escaped with the html filter... so we see the HTML tag uninterpreted. Switching to $raw for this specific case. To test: - Go to any patron account, - Fill in the various address fields - Switch the AddressFormat system preference to different settings - Verify the false display for French and German on the Details tab and in the brief info on the left side in the patron account - Apply patch - Repeat testing - All AddressFormats should now display correctly --- .../prog/en/includes/member-display-address-style.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc index cae6a2eddf..71c5a7c649 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc @@ -45,8 +45,8 @@ [%~ END ~%] [%~ IF ( patron.city ) ~%]
  • - [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | html %][%~ patron.state | html ~%][%~ END ~%] - [%~ IF ( patron.country ) ~%][% line_break | html %][%~ patron.country | html ~%][%~ END ~%] + [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%] + [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
  • [%~ END ~%] [%~ END ~%] @@ -69,8 +69,8 @@ [%~ END ~%] [%~ IF ( patron.city ) ~%]
  • - [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | html %][%~ patron.state | html ~%][%~ END ~%] - [%~ IF ( patron.country ) ~%][% line_break | html %][%~ patron.country | html ~%][%~ END ~%] + [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%] + [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%]
  • [%~ END ~%] [%~ END ~%] -- 2.11.0