From 63ae15ac02fbc6dbf472265a334944b08cdf1fb6 Mon Sep 17 00:00:00 2001 From: "Indranil Das Gupta (L2C2 Technologies)" Date: Sat, 13 Aug 2016 05:55:14 +0530 Subject: [PATCH] Bug 17103 - Google API Loader jsapi called over http MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch replaces the hardcoded protocol ("http") from the URI with https since that is what Google defacto uses to serve JS resources Prevents MIXED CONTENT failure, allowing GoogleIndicTransliteration to function correctly when used in SSLized OPACs. Test plan --------- 1/ Make sure your OPAC is being served both over HTTP and HTTPS 2/ Set GoogleIndicTransliteration syspref to "Show" 3/ Access the OPAC over http, Google transliteration element will show up in masthead searchbox. 4/ Access the OPAC over https. The element will not show. Console will show MIXED CONTENT error and failure of google loader. 5/ Apply patch. Repeat steps #3 and #4 again. Now in both cases GoogleIndicTransliteration will work. Signed-off-by: Mark Tompsett Signed-off-by: Katrin Fischer Signed-off-by: Kyle M Hall (cherry picked from commit 6fcd32a75c41c7815a883cc4952899ea24045b3c) Signed-off-by: Frédéric Demians (cherry picked from commit 3a5e20809c191ed5773e70f09c0096d14cade6c9) Signed-off-by: Julian Maurice --- koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc index 77fec3768b..1ae8c1597e 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc +++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc @@ -209,7 +209,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip); [% END %] [% IF ( GoogleIndicTransliteration ) %] - + [% END %] [% IF persona %] -- 2.20.1