fix regression when HTTPS URL is different from HTTP Tracker URL, both should...

fix regression when HTTPS URL is different from HTTP Tracker URL, both should be used in the generated tracking code refs #344

core/Piwik.php

@@ -214,7 +214,9 @@ class Piwik
         self::postEvent('Piwik.getJavascriptCode', array(&$codeImpl, $parameters));
 
         $setTrackerUrl = 'var u="//{$piwikUrl}/";';
+
         if (!empty($codeImpl['httpsPiwikUrl'])) {
+            $setTrackerUrl = 'var u=((document.location.protocol === "https:") ? "https://{$httpsPiwikUrl}/" : "http://{$piwikUrl}/");';
             $codeImpl['httpsPiwikUrl'] = rtrim($codeImpl['httpsPiwikUrl'], "/");
         }
         $codeImpl = array('setTrackerUrl' => htmlentities($setTrackerUrl)) + $codeImpl;

CustomAlerts @ f5557b8b

-Subproject commit 643984c1bab2bc48f120e3cb83fac39b270d9481
+Subproject commit f5557b8bcdb2ef6936b651a39f4e4f510b83bf6c

TasksTimetable @ 267da78a

-Subproject commit 140de8db1a1795178efd8b0d2f8e6208a192e562
+Subproject commit 267da78ac140e117fdc7ed351c69b729014165f2

VisitorGenerator @ 90327ea3

-Subproject commit 874920ab1c338a9afe24d3c7229dc5be8e741987
+Subproject commit 90327ea31c298d17cf14312d4eeefad7228c54a4

UI @ 82ec03ae

-Subproject commit 2073992deab2a2439fccb98c4befa1798ec6d649
+Subproject commit 82ec03ae540a6118c338df6e2c8ad5b8771f9001