Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattab <matthieu.aubry@gmail.com>2014-03-29 10:17:03 +0400
committermattab <matthieu.aubry@gmail.com>2014-03-29 10:17:03 +0400
commit4924334424adc8758f9e38f8c357d4f2a6f06766 (patch)
tree86f13a6b27650755ad11f3cf9913b97ed6122cc1
parent4bb2de047b8da4cad0f84e11029e6de9126eec2d (diff)
Refs #4926 when loaded over HTTPS, make the sure PiwikUrl is https (even though it may be cached as HTTP)
-rw-r--r--core/SettingsPiwik.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index 64015a560a..4c8bcaea70 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -191,6 +191,10 @@ class SettingsPiwik
}
$url = $currentUrl;
}
+
+ if(ProxyHttp::isHttps()) {
+ $url = str_replace("http://", "https://", $url);
+ }
return $url;
}