Bugzilla – Attachment 111827 Details for
Bug 26666
Display issue with address information
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 26666: Fix line breaks in addresses displayed with AddressFormat French or German
Bug-26666-Fix-line-breaks-in-addresses-displayed-w.patch (text/plain), 3.03 KB, created by
Séverine Queune
on 2020-10-16 06:52:25 UTC
(
hide
)
Description:
Bug 26666: Fix line breaks in addresses displayed with AddressFormat French or German
Filename:
MIME Type:
Creator:
Séverine Queune
Created:
2020-10-16 06:52:25 UTC
Size:
3.03 KB
patch
obsolete
>From 9b2a9cdf41ce3a284b62504cbb7532f809497515 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Fri, 16 Oct 2020 02:00:16 +0200 >Subject: [PATCH] Bug 26666: Fix line breaks in addresses displayed with > AddressFormat French or German >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >When Addressformat is set to French or German the addresses on the Details >tab will display <br /> in plain text. This is because a TT variable is used >for adding line breaks that is either set to <br /> 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 > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> >--- > .../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 cae6a2e..71c5a7c 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 ) ~%] > <li class="patroncity"> >- [%~ 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 ~%] > </li> > [%~ END ~%] > [%~ END ~%] >@@ -69,8 +69,8 @@ > [%~ END ~%] > [%~ IF ( patron.city ) ~%] > <li class="patroncity"> >- [%~ 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 ~%] > </li> > [%~ END ~%] > [%~ END ~%] >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 26666
:
111539
|
111819
|
111827
|
111830
|
111831