diff options
author | Jesse <jesse@orangecoding.com> | 2014-09-04 06:12:11 +0400 |
---|---|---|
committer | Jesse <jesse@orangecoding.com> | 2014-09-04 06:12:11 +0400 |
commit | e7760f2405c70987a7c8f609bce40556090d0548 (patch) | |
tree | c7601e3f16003d3ec9ed17a9e68b7b6ffa656171 /core/Piwik.php | |
parent | a6639a74bb7648347639ba7ceba928ebb8083a10 (diff) |
Added the protocol-agnostic URL format to the Tracker's fallback image.
Diffstat (limited to 'core/Piwik.php')
-rw-r--r-- | core/Piwik.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/Piwik.php b/core/Piwik.php index e91a0c8e51..d1be7e4456 100644 --- a/core/Piwik.php +++ b/core/Piwik.php @@ -211,13 +211,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'], "/"); - } else { - $setTrackerUrl = 'var u="//{$piwikUrl}/";'; } $codeImpl = array('setTrackerUrl' => htmlentities($setTrackerUrl)) + $codeImpl; |