From 5a7ee2db081ea4a71ebe98291faf8a7c70994ae5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 8 Aug 2018 16:13:05 -0300 Subject: [PATCH] Bug 13618: Deal with span in patron-title Signed-off-by: Owen Leonard Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- .../intranet-tmpl/prog/en/includes/patron-title.inc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc index f78dfe8d87..362be9bbd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -1,3 +1,4 @@ +[%- USE raw -%] [%- USE Koha -%] [%- USE Branches -%] [%- SET data = {} -%] @@ -29,12 +30,13 @@ [%# Parameter no_html - if 1, the html tags are NOT generated %] [%- IF data.title %] [%- IF no_html %] - [%- span_start = '' | html %] - [%- span_end = '' | html %] + [%- span_start = '' %] + [%- span_end = '' %] [%- ELSE %] [%- span_start = '' %] - [%- span_end = '' | html %] + [%- span_end = '' %] [%- END %] + [% data.title = data.title | html %] [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%] [%- END -%] [%- SET display_patron_name = 1 -%] @@ -57,9 +59,9 @@ [%- IF data.category_type == 'I' -%] [%- data.surname | html %] [% IF data.othernames %] ([% data.othernames | html %])[% END -%] [%- ELSIF invert_name -%] - [% data.title | html %][%- data.surname | html %], [% data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END -%] + [% data.title | $raw %][%- data.surname | html %], [% data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END -%] [%- ELSE -%] - [% data.title | html %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] + [% data.title | $raw %][%- data.firstname | html %] [% IF data.othernames %] ([% data.othernames | html %]) [% END %] [% data.surname | html -%] [%- END -%] [%- IF display_cardnumber AND data.cardnumber %] ([% data.cardnumber | html %])[% END -%] [%- ELSIF display_cardnumber -%] -- 2.39.5