Bug 12648: Fix conflict with bug 8096

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Patch fixes the regression found while testing. Thanks for the fast response Jonathan

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..dbcab25 100644 (file)
--- 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 -%]