From 855c8f47b7ae0fcb37f5aa9b2d9cce99472c5013 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 11 Mar 2015 16:35:18 +0100 Subject: [PATCH] Bug 12648: Fix conflict with bug 8096 Signed-off-by: Tomas Cohen Arazi Patch fixes the regression found while testing. Thanks for the fast response Jonathan --- koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc | 8 ++++---- 1 file 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 88b0f3f986..dbcab25ef1 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 -%] -- 2.39.5