Skip to content

Commit 21b0b3e

Browse files
committed
MAGETWO-95921: Revert from 2.2.7 fixes not delivered to 2.3.0
1 parent 991d785 commit 21b0b3e

File tree

6 files changed

+2
-46
lines changed

6 files changed

+2
-46
lines changed

.htaccess

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -364,15 +364,6 @@
364364
Require all denied
365365
</IfVersion>
366366
</Files>
367-
<Files .user.ini>
368-
<IfVersion < 2.4>
369-
order allow,deny
370-
deny from all
371-
</IfVersion>
372-
<IfVersion >= 2.4>
373-
Require all denied
374-
</IfVersion>
375-
</Files>
376367

377368
# For 404s and 403s that aren't handled by the application, show plain 404 response
378369
ErrorDocument 404 /pub/errors/404.php

.htaccess.sample

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -341,15 +341,6 @@
341341
Require all denied
342342
</IfVersion>
343343
</Files>
344-
<Files .user.ini>
345-
<IfVersion < 2.4>
346-
order allow,deny
347-
deny from all
348-
</IfVersion>
349-
<IfVersion >= 2.4>
350-
Require all denied
351-
</IfVersion>
352-
</Files>
353344

354345
# For 404s and 403s that aren't handled by the application, show plain 404 response
355346
ErrorDocument 404 /pub/errors/404.php

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
namespace Magento\AdminNotification\Block\Grid\Renderer;
1010

11-
/**
12-
* Renderer class for action in the admin notifications grid
13-
*/
1411
class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
1512
{
1613
/**
@@ -40,8 +37,7 @@ public function __construct(
4037
*/
4138
public function render(\Magento\Framework\DataObject $row)
4239
{
43-
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' .
44-
$this->escapeUrl($row->getUrl()) . '">' .
40+
$readDetailsHtml = $row->getUrl() ? '<a class="action-details" target="_blank" href="' . $row->getUrl() . '">' .
4541
__('Read Details') . '</a>' : '';
4642

4743
$markAsReadHtml = !$row->getIsRead() ? '<a class="action-mark" href="' . $this->getUrl(

app/code/Magento/Newsletter/view/adminhtml/templates/preview/iframeswitcher.phtml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,7 @@
1616
</div>
1717
<?php endif;?>
1818
</div>
19-
<iframe
20-
name="preview_iframe"
21-
id="preview_iframe"
22-
frameborder="0"
23-
title="<?= $block->escapeHtmlAttr(__('Preview')) ?>"
24-
width="100%"
25-
sandbox="allow-forms allow-pointer-lock allow-scripts">
26-
</iframe>
19+
<iframe name="preview_iframe" id="preview_iframe" frameborder="0" title="<?= $block->escapeHtmlAttr(__('Preview')) ?>" width="100%"></iframe>
2720
<?= $block->getChildHtml('preview_form') ?>
2821
</div>
2922

nginx.conf.sample

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@ charset UTF-8;
3333
error_page 404 403 = /errors/404.php;
3434
#add_header "X-UA-Compatible" "IE=Edge";
3535

36-
# Deny access to sensitive files
37-
location /.user.ini {
38-
deny all;
39-
}
40-
4136
# PHP entry point for setup application
4237
location ~* ^/setup($|/) {
4338
root $MAGE_ROOT;

pub/.htaccess

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -220,16 +220,6 @@ ErrorDocument 403 /errors/404.php
220220
Require all denied
221221
</IfVersion>
222222
</Files>
223-
## Deny access to .user.ini##
224-
<Files .user.ini>
225-
<IfVersion < 2.4>
226-
order allow,deny
227-
deny from all
228-
</IfVersion>
229-
<IfVersion >= 2.4>
230-
Require all denied
231-
</IfVersion>
232-
</Files>
233223

234224
<IfModule mod_headers.c>
235225
############################################

0 commit comments

Comments
 (0)