Skip to content

Commit

Permalink
Bug 17103 - Google API Loader jsapi called over http
Browse files Browse the repository at this point in the history
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 <[email protected]>

Signed-off-by: Katrin Fischer <[email protected]>

Signed-off-by: Kyle M Hall <[email protected]>
(cherry picked from commit 6fcd32a)
Signed-off-by: Frédéric Demians <[email protected]>
(cherry picked from commit 3a5e208)
Signed-off-by: Julian Maurice <[email protected]>
  • Loading branch information
indradg authored and jajm committed Aug 24, 2016
1 parent f93adcc commit 63ae15a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-bottom.inc
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ $.widget.bridge('uitooltip', $.ui.tooltip);
</script>
[% END %]
[% IF ( GoogleIndicTransliteration ) %]
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="[% interface %]/[% theme %]/js/googleindictransliteration.js"></script>
[% END %]
[% IF persona %]
Expand Down

0 comments on commit 63ae15a

Please sign in to comment.