diff options
| author | Stefan Giehl <stefan@matomo.org> | 2021-03-11 20:06:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-11 20:06:23 +0300 |
| commit | 96fcda9f807e157409173a6135a895e358f52c95 (patch) | |
| tree | 1159bb4b264315401e6354d3f69e117c086b1100 /tests/PHPUnit/Fixtures | |
| parent | c334b3d84e630af9c6f30a81aa5810057ae08bac (diff) | |
Use https for urls in visitor details if host is defined with https in site (#17151)
* Use https for urls in visitor details if host is defined with https in site
* Use strpos/parse_url instead of preg_match
* apply review feedback
* also replace protocol in url metadata in page urls reports
* apply review feedback
Co-authored-by: diosmosis <diosmosis@users.noreply.github.com>
Diffstat (limited to 'tests/PHPUnit/Fixtures')
| -rw-r--r-- | tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php index 987017cbc8..3e6acaf023 100644 --- a/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php +++ b/tests/PHPUnit/Fixtures/TwoSitesTwoVisitorsDifferentDays.php @@ -49,7 +49,8 @@ class TwoSitesTwoVisitorsDifferentDays extends Fixture } if (!self::siteCreated($idSite = 2)) { - self::createWebsite($this->dateTime, 0, "Site 2"); + // set https url in website config, which should convert action urls to https in api response + self::createWebsite($this->dateTime, 0, "Site 2", ['http://piwik.net', 'http://example2.com', 'https://example2.com']); } if ($this->allowConversions) { |