From: Steve Sutton Date: Wed, 14 Jun 2017 17:53:36 +0000 (-0400) Subject: Switch to https X-Git-Tag: v1.2.15^2~3 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=30cc6041d56b2454b340bfc2145634ea440d86cf;p=web%2FTroutCreek.git Switch to https use https for site --- diff --git a/Toolkit/Maps/Map.php b/Toolkit/Maps/Map.php index da32eca..3dbcea2 100644 --- a/Toolkit/Maps/Map.php +++ b/Toolkit/Maps/Map.php @@ -92,7 +92,7 @@ class Toolkit_Maps_Map public function toHtml($id = "map-canvas", $w = "100%", $h = "400px") { $GLOBALS['topScripts'][] - = 'http://maps.google.com/maps/api/js?sensor=false'; + = 'https://maps.google.com/maps/api/js?sensor=false'; $GLOBALS['bottomScripts'][] = BASE_URL . 'Toolkit/Maps/js/' . $this->googleMapScript; diff --git a/Toolkit/Maps/js/google-map.js b/Toolkit/Maps/js/google-map.js index c70d3df..6836ad2 100644 --- a/Toolkit/Maps/js/google-map.js +++ b/Toolkit/Maps/js/google-map.js @@ -57,12 +57,12 @@ var Map = { } else { var pinColor = "6ABD45"; } - var pinImage = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, + var pinImage = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=%E2%80%A2|" + pinColor, new google.maps.Size(21, 34), new google.maps.Point(0, 0), new google.maps.Point(10, 34) ); - var pinShadow = new google.maps.MarkerImage("http://chart.apis.google.com/chart?chst=d_map_pin_shadow", + var pinShadow = new google.maps.MarkerImage("https://chart.apis.google.com/chart?chst=d_map_pin_shadow", new google.maps.Size(40, 37), new google.maps.Point(0, 0), new google.maps.Point(12, 35)