Skip to content

Commit a31738a

Browse files
nathanjosiahnathanjosiah
committed
Merge remote-tracking branch 'origin/MAGETWO-56444' into borg-2.3
2 parents d07e840 + 58ea689 commit a31738a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+311
-333
lines changed

‎app/code/Magento/Theme/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ Phrase,Phrase
9696
testMessage,testMessage
9797
Edit,Edit
9898
"We found no files.","We found no files."
99+
"thumbnail","thumbnail"
99100
"Browse Files","Browse Files"
100101
Scope:,Scope:
101102
Remove,Remove

‎app/code/Magento/Theme/view/adminhtml/templates/browser/content.phtml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
?>
7-
<?php
6+
87
/**
98
* Wysiwyg Images content template
109
*

‎app/code/Magento/Theme/view/adminhtml/templates/browser/content/files.phtml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,21 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
9-
?>
10-
11-
<?php
127
/** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Files */
138
?>
149

15-
<?php if ($block->getFilesCount() > 0): ?>
16-
<?php foreach ($block->getFiles() as $file): ?>
17-
<div class="filecnt file-font" id="<?= /* @escapeNotVerified */ $file['id'] ?>">
10+
<?php if ($block->getFilesCount() > 0) : ?>
11+
<?php foreach ($block->getFiles() as $file) : ?>
12+
<div class="filecnt file-font" id="<?= $block->escapeHtmlAttr($file['id']) ?>">
1813
<p class="nm">
19-
<?= /* @escapeNotVerified */ $file['text'] ?>
20-
<?php if (isset($file['thumbnailParams'])): ?>
21-
<img src="<?= /* @escapeNotVerified */ $block->getUrl('*/*/previewImage', $file['thumbnailParams']) ?>">
14+
<?= $block->escapeHtml($file['text']) ?>
15+
<?php if (isset($file['thumbnailParams'])) : ?>
16+
<img src="<?= $block->escapeUrl($block->getUrl('*/*/previewImage', $file['thumbnailParams'])) ?>"
17+
alt="<?= $block->escapeHtmlAttr(__('thumbnail')) ?>">
2218
<?php endif; ?>
2319
</p>
2420
</div>
2521
<?php endforeach; ?>
26-
<?php else: ?>
27-
<?= /* @escapeNotVerified */ __('We found no files.') ?>
22+
<?php else : ?>
23+
<?= $block->escapeHtml(__('We found no files.')) ?>
2824
<?php endif; ?>

‎app/code/Magento/Theme/view/adminhtml/templates/browser/content/uploader.phtml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,14 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
?>
9-
<?php
107
/** @var $block \Magento\Theme\Block\Adminhtml\Wysiwyg\Files\Content\Uploader */
118
?>
129

1310
<div id="<?= $block->getHtmlId() ?>" class="uploader">
1411
<span class="fileinput-button form-buttons">
15-
<span><?= /* @escapeNotVerified */ __('Browse Files') ?></span>
16-
<input id="fileupload" type="file" name="<?= /* @escapeNotVerified */ $block->getConfig()->getFileField() ?>"
17-
data-url="<?= /* @escapeNotVerified */ $block->getConfig()->getUrl() ?>" multiple>
12+
<span><?= $block->escapeHtml(__('Browse Files')) ?></span>
13+
<input id="fileupload" type="file" name="<?= $block->escapeHtmlAttr($block->getConfig()->getFileField()) ?>"
14+
data-url="<?= $block->escapeUrl($block->getConfig()->getUrl()) ?>" multiple>
1815
</span>
1916
<div class="clear"></div>
2017
<script id="<?= $block->getHtmlId() ?>-template" type="text/x-magento-template">
@@ -44,7 +41,7 @@ require([
4441
form_key: FORM_KEY
4542
},
4643
sequentialUploads: true,
47-
maxFileSize: <?= /* @escapeNotVerified */ $block->getFileSizeService()->getMaxFileSize() ?> ,
44+
maxFileSize: <?= $block->escapeJs($block->getFileSizeService()->getMaxFileSize()) ?> ,
4845
add: function (e, data) {
4946
var progressTmpl = mageTemplate('#<?= $block->getHtmlId() ?>-template'),
5047
fileSize,

‎app/code/Magento/Theme/view/adminhtml/templates/design/config/edit/scope.phtml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
/* @var $block \Magento\Theme\Block\Adminhtml\Design\Config\Edit\Scope */
108
?>
119

1210
<div class="store-view">
13-
<span class="store-switcher-label"><?= /* @escapeNotVerified */ __('Scope:') ?></span>
14-
<span class="store-switcher-value"><?= /* @escapeNotVerified */ $block->getScopeTitle() ?></span>
11+
<span class="store-switcher-label"><?= $block->escapeHtml(__('Scope:')) ?></span>
12+
<span class="store-switcher-value"><?= $block->escapeHtml($block->getScopeTitle()) ?></span>
1513
</div>

‎app/code/Magento/Theme/view/adminhtml/templates/tabs/css.phtml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
/** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */
67
?>
78

8-
<?php /** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css */ ?>
9-
109
<?= $block->getFormHtml() ?>
1110

1211
<script>
@@ -20,7 +19,7 @@ require([
2019
$( '#css_file_uploader' ).fileupload({
2120
dataType: 'json',
2221
replaceFileInput: false,
23-
url : '<?= /* @escapeNotVerified */ $block->getUrl('*/system_design_theme/uploadcss') ?>',
22+
url : '<?= $block->escapeJs($block->escapeUrl($block->getUrl('*/system_design_theme/uploadcss'))) ?>',
2423
acceptFileTypes: /(.|\/)(css)$/i,
2524

2625
/**

‎app/code/Magento/Theme/view/adminhtml/templates/tabs/fieldset/js.phtml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
7+
// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
8+
/** @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */
89
?>
9-
<?php /** @var $block \Magento\Backend\Block\Widget\Form\Renderer\Fieldset */ ?>
1010

1111
<div id="js-file-uploader" class="uploader">
1212
</div>
@@ -32,7 +32,7 @@
3232
id="remove_js_files_<%- data.id %>"
3333
name="js_removed_files[]"
3434
value="<%- data.id %>" />
35-
<label for="remove_js_files_<%- data.id %>"><?= /* @escapeNotVerified */ __('Remove') ?></label>
35+
<label for="remove_js_files_<%- data.id %>"><?= $block->escapeHtml(__('Remove')) ?></label>
3636
</div>
3737
</div>
3838

@@ -60,7 +60,9 @@ jQuery(function($) {
6060
});
6161
$('body').trigger(
6262
'refreshJsList',
63-
{jsList: <?= /* @escapeNotVerified */ $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getJsFiles()) ?>}
63+
{
64+
jsList: <?= /* @noEscape */ $this->helper(Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getJsFiles()) ?>
65+
}
6466
);
6567
});
6668

‎app/code/Magento/Theme/view/adminhtml/templates/tabs/js.phtml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
/** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js */
68
?>
7-
<?php /** @var $block \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Js */ ?>
89
<?= $block->getFormHtml() ?>
910

1011
<script>
@@ -21,7 +22,7 @@ require([
2122
dataType: 'json',
2223
replaceFileInput: false,
2324
sequentialUploads: true,
24-
url: '<?= /* @escapeNotVerified */ $block->getJsUploadUrl() ?>',
25+
url: '<?= $block->escapeJs($block->escapeUrl($block->getJsUploadUrl())) ?>',
2526

2627
/**
2728
* Add data

‎app/code/Magento/Theme/view/adminhtml/templates/title.phtml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,15 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
// @codingStandardsIgnoreFile
8-
97
/**
108
* @var $block \Magento\Theme\Block\Html\Title
119
*/
12-
$titleId = ($block->getTitleId()) ? ' id="' . $block->getTitleId() . '"' : '';
10+
$titleIdHtml = ($block->getTitleId()) ? ' id="' . $block->escapeHtmlAttr($block->getTitleId()) . '"' : '';
1311
$titleClass = ($block->getTitleClass()) ? ' ' . $block->getTitleClass() : '';
14-
$title = $block->escapeHtml($block->getPageTitle());
12+
$title = $block->getPageTitle();
1513
?>
1614

17-
<div class="page-title-wrapper<?= /* @escapeNotVerified */ $titleClass ?>">
18-
<h1 class="page-title"<?= /* @escapeNotVerified */ $titleId ?>><?= /* @escapeNotVerified */ $title ?></h1>
15+
<div class="page-title-wrapper<?= $block->escapeHtmlAttr($titleClass) ?>">
16+
<h1 class="page-title"<?= /* @noEscape */ $titleIdHtml ?>><?= $block->escapeHtml($title) ?></h1>
1917
<?= $block->getChildHtml() ?>
2018
</div>

‎app/code/Magento/Theme/view/base/templates/root.phtml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
7-
// @codingStandardsIgnoreFile
8-
96
?>
107
<!doctype html>
11-
<html <?= /* @escapeNotVerified */ $htmlAttributes ?>>
12-
<head <?= /* @escapeNotVerified */ $headAttributes ?>>
13-
<?= /* @escapeNotVerified */ $requireJs ?>
14-
<?= /* @escapeNotVerified */ $headContent ?>
15-
<?= /* @escapeNotVerified */ $headAdditional ?>
8+
<html <?= /* @noEscape */ $htmlAttributes ?>>
9+
<head <?= /* @noEscape */ $headAttributes ?>>
10+
<?= /* @noEscape */ $requireJs ?>
11+
<?= /* @noEscape */ $headContent ?>
12+
<?= /* @noEscape */ $headAdditional ?>
1613
</head>
17-
<body data-container="body" data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @escapeNotVerified */ $loaderIcon ?>"}}' <?= /* @escapeNotVerified */ $bodyAttributes ?>>
18-
<?= /* @escapeNotVerified */ $layoutContent ?>
14+
<body data-container="body"
15+
data-mage-init='{"loaderAjax": {}, "loader": { "icon": "<?= /* @noEscape */ $loaderIcon ?>"}}'
16+
<?= /* @noEscape */ $bodyAttributes ?>>
17+
<?= /* @noEscape */ $layoutContent ?>
1918
</body>
2019
</html>

0 commit comments

Comments
 (0)