From 55e9501da4fbc1171e06cd56ba798ba3b60a2ef5 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 30 Jan 2015 15:40:33 +0100 Subject: [PATCH] [PASSED QA] Bug 13021: Fix conflict with bug 8096 Bug 8096 added new breaklines, the corrupt the json string. This patch removes them. Signed-off-by: Kyle M Hall --- .../prog/en/includes/patron-title.inc | 8 ++++---- 1 files changed, 4 insertions(+), 4 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 88b0f3f..056134b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -8,9 +8,9 @@ [%- borrower.firstname %] [% IF borrower.othernames %] ([% borrower.othernames %]) [% END %] [% borrower.surname %] [%- END -%] [%- END -%] - [% IF ( borrower.cardnumber ) %] + [%- IF borrower.cardnumber -%] ([% borrower.cardnumber %]) - [% END %] + [%- END -%] [%- ELSIF ( borrowernumber ) %] [%- IF category_type == 'I' %] [%- surname %] [% IF othernames %] ([% othernames %]) [% END %] @@ -21,7 +21,7 @@ [%- firstname %] [% IF othernames %] ([% othernames %]) [% END %] [% surname %] [%- END %] [%- END -%] - [% IF ( cardnumber ) %] + [%- IF cardnumber -%] ([% cardnumber %]) - [% END %] + [%- END -%] [%- END -%] -- 1.7.2.5