From a30f93dcb96c2dfde1d63ff974820a3d6dc3b4a2 Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Fri, 2 Jun 2017 03:37:21 +0000
Subject: [PATCH] Bug 12691: [FOLLOW-UP] Follow-up patch

This patch fixes merge conflicts and fixes the problems in Comment 7
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
index e6356ac..a54f4c5 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt
@@ -202,9 +202,11 @@
                                 </div>
                             </div> <!-- / #newcheckout -->
                 </div> <!-- / .span12/12 -->
-                [% IF ( Koha.Preference('ShowPatronImageInWebBasedSelfCheck') && image_exists ) %]
+                [% IF ( Koha.Preference('ShowPatronImageInWebBasedSelfCheck') %]
                     <div class="span2">
-                        <img src="/cgi-bin/koha/sco/sco-patron-image.pl?borrowernumber=[% borrowernumber %]&csrf_token=[% csrf_token %]" alt="" />
+                        [% IF ( display_patron_image ) %]
+                            <img src="/cgi-bin/koha/sco/sco-patron-image.pl?borrowernumber=[% borrowernumber %]&csrf_token=[% csrf_token %]" alt="" />
+                        [% END %]
                     </div>
                 [% END %]
             </div> <!-- / .row-fluid -->
-- 
2.1.4