diff options
Diffstat (limited to 'plugins/CoreHome')
-rw-r--r-- | plugins/CoreHome/LoginAllowlist.php | 7 | ||||
-rw-r--r-- | plugins/CoreHome/tests/Integration/ChangesTest.php | 4 | ||||
-rw-r--r-- | plugins/CoreHome/tests/UI/expected-screenshots/Changes_show_popover.png | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/plugins/CoreHome/LoginAllowlist.php b/plugins/CoreHome/LoginAllowlist.php index 5101e7e3d9..630d50de85 100644 --- a/plugins/CoreHome/LoginAllowlist.php +++ b/plugins/CoreHome/LoginAllowlist.php @@ -34,8 +34,11 @@ class LoginAllowlist return false; } - // ignore whitelist checks for opt out iframe - if (!SettingsServer::isTrackerApiRequest() && 'CoreAdminHome' === Piwik::getModule() && 'optOut' === Piwik::getAction()) { + // ignore whitelist checks for opt out iframe or opt out JS + if (!SettingsServer::isTrackerApiRequest() + && (('CoreAdminHome' === Piwik::getModule() && ('optOut' === Piwik::getAction() || 'optOutJS' === Piwik::getAction()))) + ) + { return false; } diff --git a/plugins/CoreHome/tests/Integration/ChangesTest.php b/plugins/CoreHome/tests/Integration/ChangesTest.php index 3c22ad03f3..f722b15324 100644 --- a/plugins/CoreHome/tests/Integration/ChangesTest.php +++ b/plugins/CoreHome/tests/Integration/ChangesTest.php @@ -27,7 +27,7 @@ class ChangesTest extends IntegrationTestCase public function test_CoreHomeChanges_ShouldSortChangeListMostRecentFirst() { - $json = '{"idchange":5,"plugin_name":"CoreHome","version":"4.6.0b5","title":"New feature x added","description":"Now you can do a with b like this","link_name":"For more information go here","link":"https:\/\/www.matomo.org"}'; + $json = '{"idchange":6,"plugin_name":"CoreHome","version":"4.6.0b5","title":"New feature x added","description":"Now you can do a with b like this","link_name":"For more information go here","link":"https:\/\/www.matomo.org"}'; $changesModel = new ChangesModel(); $changes = $changesModel->getChangeItems(); $r = reset($changes); @@ -37,7 +37,7 @@ class ChangesTest extends IntegrationTestCase public function test_CoreHomeChanges_ShouldAllowChangeItemAddWithoutLink() { - $json = '{"idchange":4,"plugin_name":"CoreHome","version":"4.5.0","title":"New feature y added","description":"Now you can do c with d like this","link_name":null,"link":null}'; + $json = '{"idchange":5,"plugin_name":"CoreHome","version":"4.5.0","title":"New feature y added","description":"Now you can do c with d like this","link_name":null,"link":null}'; $changesModel = new ChangesModel(); $changes = $changesModel->getChangeItems(); $r = $changes[1]; diff --git a/plugins/CoreHome/tests/UI/expected-screenshots/Changes_show_popover.png b/plugins/CoreHome/tests/UI/expected-screenshots/Changes_show_popover.png index bd5f69163c..1e99a11bb8 100644 --- a/plugins/CoreHome/tests/UI/expected-screenshots/Changes_show_popover.png +++ b/plugins/CoreHome/tests/UI/expected-screenshots/Changes_show_popover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f844aa8ae955f79da1581be5763ba61d01774043be2b5856df5f3b7894dbc24c -size 72788 +oid sha256:67388f4d2ea66a2e8e47a7c2d722088e7ea5b319ecfaf78dc1cc9dd1e5beaa2b +size 103258 |