diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-10-08 06:06:24 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-08 06:06:24 +0300 |
| commit | d0701d845fc06c83d31efd518a1cc47c88a9bf17 (patch) | |
| tree | a18b6ba87370608fa0e3245af64d3f3cb643456a /plugins/Installation | |
| parent | 1bcbf2f0f5e7787b3b842de35f2707f94a3dfd38 (diff) | |
By default use https during installation in website setup (#16547)
* By default use https during installation in website setup
* fix ui test
Diffstat (limited to 'plugins/Installation')
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Installation/FormFirstWebsiteSetup.php b/plugins/Installation/FormFirstWebsiteSetup.php index 851cd22d9d..5f8c738840 100644 --- a/plugins/Installation/FormFirstWebsiteSetup.php +++ b/plugins/Installation/FormFirstWebsiteSetup.php @@ -34,8 +34,8 @@ class FormFirstWebsiteSetup extends QuickForm2 { HTML_QuickForm2_Factory::registerRule('checkTimezone', 'Piwik\Plugins\Installation\Rule_isValidTimezone'); - $urlExample = 'http://example.org'; - $javascriptOnClickUrlExample = "javascript:if (this.value=='$urlExample'){this.value='http://';} this.style.color='black';"; + $urlExample = 'https://example.org'; + $javascriptOnClickUrlExample = "javascript:if (this.value=='$urlExample'){this.value='https://';} this.style.color='black';"; $timezones = API::getInstance()->getTimezonesList(); $timezones = array_merge(array('No timezone' => Piwik::translate('SitesManager_SelectACity')), $timezones); diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png index 1c300ec2d8..292e6c48e0 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1b82b249df3d2fb3c36121766be477bfdf745840fcdcba459fc90fd434a42348 -size 76932 +oid sha256:9181e8c0225ed4d89b25c7979716327986ec6b505103b6f76d263750dd54d18a +size 77143 diff --git a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png index 3640679b90..adc59a73bb 100644 --- a/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png +++ b/plugins/Installation/tests/UI/expected-screenshots/Installation_setup_website_fail.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9488358df739b760e23250f478c1f0611f38e24de7264c9bd8fabcfe25fb4866 -size 81796 +oid sha256:00a5682d9d547a8c77e62027796d034d958b24a29a24ee34d46def9a480d0eac +size 81993 |
