Fixed the X-Frame bug #10284
Fixed the X-Frame bug #10284
Conversation
|
|
|
@auchri - Ok thanks! I will fix it. Is this why the test failed? |
|
No, PhontomJS crashed during the build. |
| @@ -41,6 +41,9 @@ function init() | |||
| $adapters = array(); | |||
| foreach ($availableAdapters as $adapter => $port) { | |||
| $adapters[$adapter] = $adapter; | |||
| if ($adapter == 'PDO\MYSQL') { | |||
| $adapters[$adapter] .= ' (Recommended)'; | |||
There was a problem hiding this comment.
This would ideally use a translation. Can you try something like '(' . Piwik::translate('General_Recommended') . ')'?
|
I think the PhantomJs crash is not related to your change. I will restart the test |
|
The test is still failing because of pixel difference. Can it be caused because of the fact that I have added the (Recommended) word? |
|
You can see the UI changes / the failing tests here: http://builds-artifacts.piwik.org/piwik/piwik/master/19281/ and they look good. We will fix them once this PR is merged |
|
Can someone confirm the PR works as expected? I presume we might need to test this in different browsers. |
|
Thanks @blueelvis for the PR. did you maybe test the iframe code in several browsers such as IE and Firefox? according to https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options it won't work on Chrome anyway.. |
| } | ||
| if ($option == 'allow') { | ||
| $this->xFrameOptions = null; | ||
| if (stripos($option, 'allow-from') !== false) { |
There was a problem hiding this comment.
- maybe you can edit the function docblock comment and add this new
allow-fromvalue, and an example of how to set it?
|
Please close this PR because for some unknown reason, this is not getting updated. New PR has been created #10317 |
sgiehl
added
the
not-in-changelog
Regarding - #10167
Does this look good?