From 25545fdc55a1decd13548c1f3f6479789956e56c Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Thu, 11 Sep 2014 00:41:23 +1200
Subject: [PATCH] fixes #6132 always show opt out iframe on all domains, do
not secure the iframe
---
plugins/CoreAdminHome/Controller.php | 1 +
tests/PHPUnit/UI | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 6886b0d336..6b672d07e8 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -263,6 +263,7 @@ class Controller extends \Piwik\Plugin\ControllerAdmin
// an error when setBasicVariablesAdminView is called, and MenuTop is requested (the idSite query
// parameter is required)
$view = new View("@CoreAdminHome/optOut");
+ $view->setXFrameOptions('allow');
$view->trackVisits = $trackVisits;
$view->nonce = Nonce::getNonce('Piwik_OptOut', 3600);
$view->language = $lang;
diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI
index beb61478b4..14b5a0ba52 160000
--- a/tests/PHPUnit/UI
+++ b/tests/PHPUnit/UI
@@ -1 +1 @@
-Subproject commit beb61478b49c3cd67a7eb20038e36346f800ca63
+Subproject commit 14b5a0ba52e5193497d8b24765d221ce66cc086a
--
GitLab