From 6a1f7ee1b4f0767f68c837534ba9b84df79974b0 Mon Sep 17 00:00:00 2001
From: Liz Rea <liz@catalyst.net.nz>
Date: Tue, 21 Jul 2015 10:41:02 +1200
Subject: [PATCH] [SIGNED-OFF] Bug 14571: using_https check for ssl connections
 doesn't work in some situations
Content-Type: text/plain; charset="utf-8"

To test:

* turn on Amazon images for result and detail in the OPAC
* do a search that will result in an Amazon image being displayed on the
  result page
* inspect the cover image that is returned on the result page, it should
  be using a https://images-na... Amazon URL.
* click through to the detail for that item
* inspect the cover image that is returned on the detail page, it should
  be using a https://images-na... Amazon URL.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt  | 4 ----
 koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index 3b5c404..2b5a730 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -58,11 +58,7 @@
                         [% ELSE %]
                             <a href="http://www.amazon[% AmazonTld %]/dp/[% normalized_isbn %]">
                         [% END %]
-                        [% IF ( using_https ) %]
                             <img border="0" src="https://images-na.ssl-images-amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>
-                        [% ELSE %]
-                            <img border="0" src="http://images.amazon.com/images/P/[% normalized_isbn %].01.MZZZZZZZ.jpg" alt="Cover image" /></a>
-                        [% END %]
                     [% END %]
 
                     [% IF ( SyndeticsEnabled && SyndeticsCoverImages ) %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index 8a0ec89..f2c3d7d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -240,11 +240,7 @@
                                                         [% END %]
                                                         [% IF ( OPACAmazonCoverImages ) %]
                                                             [% IF ( SEARCH_RESULT.normalized_isbn ) %]
-                                                                [% IF ( using_https ) %]
                                                                     <span title="[% SEARCH_RESULT.biblionumber %]" id="amazon-thumbnail[% loop.count %]"><img src="https://images-na.ssl-images-amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" class="item-thumbnail" /></span>
-                                                                [% ELSE %]
-                                                                <span title="[% SEARCH_RESULT.biblionumber %]" id="amazon-thumbnail[% loop.count %]"><img src="http://images.amazon.com/images/P/[% SEARCH_RESULT.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" class="item-thumbnail" /></span>
-                                                                [% END %]
                                                             [% ELSE %]
                                                                 <span class="no-image">No cover image available</span>
                                                             [% END %]
-- 
2.1.4