Skip to content

Commit ecc28f4

Browse files
veloravenveloraven
committed
ACP2E-2693: [Cloud] Frontend not loading due to issue in newsletter template
1 parent 021eb75 commit ecc28f4

File tree

7 files changed

+117
-110
lines changed

7 files changed

+117
-110
lines changed

‎app/code/Magento/Contact/view/frontend/templates/form.phtml‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,40 +14,41 @@ if (!$block->getButtonLockManager()) {
1414
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
1515
);
1616
}
17+
/** @var $escaper \Magento\Framework\Escaper */
1718
/** @var \Magento\Contact\ViewModel\UserDataProvider $viewModel */
1819

1920
$viewModel = $block->getViewModel();
2021
?>
2122
<form class="form contact"
22-
action="<?= $block->escapeUrl($block->getFormAction()) ?>"
23+
action="<?= $escaper->escapeUrl($block->getFormAction()) ?>"
2324
id="contact-form"
2425
method="post"
25-
data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>"
26+
data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>"
2627
data-mage-init='{"validation":{}}'>
2728
<fieldset class="fieldset">
28-
<legend class="legend"><span><?= $block->escapeHtml(__('Write Us')) ?></span></legend><br />
29+
<legend class="legend"><span><?= $escaper->escapeHtml(__('Write Us')) ?></span></legend><br />
2930
<div class="field note no-label">
30-
<?= $block->escapeHtml(__('Jot us a note and we’ll get back to you as quickly as possible.')) ?>
31+
<?= $escaper->escapeHtml(__('Jot us a note and we’ll get back to you as quickly as possible.')) ?>
3132
</div>
3233
<div class="field name required">
33-
<label class="label" for="name"><span><?= $block->escapeHtml(__('Name')) ?></span></label>
34+
<label class="label" for="name"><span><?= $escaper->escapeHtml(__('Name')) ?></span></label>
3435
<div class="control">
3536
<input name="name"
3637
id="name"
37-
title="<?= $block->escapeHtmlAttr(__('Name')) ?>"
38-
value="<?= $block->escapeHtmlAttr($viewModel->getUserName()) ?>"
38+
title="<?= $escaper->escapeHtmlAttr(__('Name')) ?>"
39+
value="<?= $escaper->escapeHtmlAttr($viewModel->getUserName()) ?>"
3940
class="input-text"
4041
type="text"
4142
data-validate="{required:true}"/>
4243
</div>
4344
</div>
4445
<div class="field email required">
45-
<label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
46+
<label class="label" for="email"><span><?= $escaper->escapeHtml(__('Email')) ?></span></label>
4647
<div class="control">
4748
<input name="email"
4849
id="email"
49-
title="<?= $block->escapeHtmlAttr(__('Email')) ?>"
50-
value="<?= $block->escapeHtmlAttr($viewModel->getUserEmail()) ?>"
50+
title="<?= $escaper->escapeHtmlAttr(__('Email')) ?>"
51+
value="<?= $escaper->escapeHtmlAttr($viewModel->getUserEmail()) ?>"
5152
class="input-text"
5253
type="email"
5354
data-validate="{required:true, 'validate-email':true}"
@@ -56,42 +57,42 @@ $viewModel = $block->getViewModel();
5657
</div>
5758
</div>
5859
<div class="field telephone">
59-
<label class="label" for="telephone"><span><?= $block->escapeHtml(__('Phone Number')) ?></span></label>
60+
<label class="label" for="telephone"><span><?= $escaper->escapeHtml(__('Phone Number')) ?></span></label>
6061
<div class="control">
6162
<input name="telephone"
6263
id="telephone"
63-
title="<?= $block->escapeHtmlAttr(__('Phone Number')) ?>"
64-
value="<?= $block->escapeHtmlAttr($viewModel->getUserTelephone()) ?>"
64+
title="<?= $escaper->escapeHtmlAttr(__('Phone Number')) ?>"
65+
value="<?= $escaper->escapeHtmlAttr($viewModel->getUserTelephone()) ?>"
6566
class="input-text"
6667
type="tel" />
6768
</div>
6869
</div>
6970
<div class="field comment required">
7071
<label class="label" for="comment">
71-
<span><?= $block->escapeHtml(__('What’s on your mind?')) ?></span>
72+
<span><?= $escaper->escapeHtml(__('What’s on your mind?')) ?></span>
7273
</label>
7374
<div class="control">
7475
<textarea name="comment"
7576
id="comment"
76-
title="<?= $block->escapeHtmlAttr(__('What’s on your mind?')) ?>"
77+
title="<?= $escaper->escapeHtmlAttr(__('What’s on your mind?')) ?>"
7778
class="input-text"
7879
cols="5"
7980
rows="3"
8081
data-validate="{required:true}"
81-
><?= $block->escapeHtml($viewModel->getUserComment()) ?></textarea>
82+
><?= $escaper->escapeHtml($viewModel->getUserComment()) ?></textarea>
8283
</div>
8384
</div>
8485
<?= $block->getChildHtml('form.additional.info') ?>
8586
</fieldset>
8687
<div class="actions-toolbar">
8788
<div class="primary">
8889
<input type="hidden" name="hideit" id="hideit" value="" />
89-
<button type="submit" title="<?= $block->escapeHtmlAttr(__('Submit')) ?>" class="action submit primary"
90+
<button type="submit" title="<?= $escaper->escapeHtmlAttr(__('Submit')) ?>" class="action submit primary"
9091
id="send2"
9192
<?php if ($block->getButtonLockManager()->isDisabled('contact_us_form_submit')): ?>
9293
disabled="disabled"
9394
<?php endif; ?>>
94-
<span><?= $block->escapeHtml(__('Submit')) ?></span>
95+
<span><?= $escaper->escapeHtml(__('Submit')) ?></span>
9596
</button>
9697
</div>
9798
</div>

‎app/code/Magento/Customer/view/frontend/templates/form/edit.phtml‎

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,18 @@ if (!$block->getButtonLockManager()) {
1313
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
1414
);
1515
}
16+
/** @var $escaper \Magento\Framework\Escaper */
1617
/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
1718
?>
1819
<form class="form form-edit-account"
19-
action="<?= $block->escapeUrl($block->getUrl('customer/account/editPost')) ?>"
20+
action="<?= $escaper->escapeUrl($block->getUrl('customer/account/editPost')) ?>"
2021
method="post" id="form-validate"
2122
enctype="multipart/form-data"
22-
data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>"
23+
data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>"
2324
autocomplete="off">
2425
<fieldset class="fieldset info">
2526
<?= $block->getBlockHtml('formkey') ?>
26-
<legend class="legend"><span><?= $block->escapeHtml(__('Account Information')) ?></span></legend><br>
27+
<legend class="legend"><span><?= $escaper->escapeHtml(__('Account Information')) ?></span></legend><br>
2728
<?= $block->getLayout()->createBlock(Name::class)->setObject($block->getCustomer())->toHtml() ?>
2829

2930
<?php $_dob = $block->getLayout()->createBlock(\Magento\Customer\Block\Widget\Dob::class) ?>
@@ -40,39 +41,39 @@ if (!$block->getButtonLockManager()) {
4041
<?php endif ?>
4142
<div class="field choice">
4243
<input type="checkbox" name="change_email" id="change-email" data-role="change-email" value="1"
43-
title="<?= $block->escapeHtmlAttr(__('Change Email')) ?>" class="checkbox" />
44+
title="<?= $escaper->escapeHtmlAttr(__('Change Email')) ?>" class="checkbox" />
4445
<label class="label" for="change-email">
45-
<span><?= $block->escapeHtml(__('Change Email')) ?></span>
46+
<span><?= $escaper->escapeHtml(__('Change Email')) ?></span>
4647
</label>
4748
</div>
4849
<div class="field choice">
4950
<input type="checkbox" name="change_password" id="change-password" data-role="change-password" value="1"
50-
title="<?= $block->escapeHtmlAttr(__('Change Password')) ?>"
51+
title="<?= $escaper->escapeHtmlAttr(__('Change Password')) ?>"
5152
<?php if ($block->getChangePassword()): ?> checked="checked"<?php endif; ?> class="checkbox" />
5253
<label class="label" for="change-password">
53-
<span><?= $block->escapeHtml(__('Change Password')) ?></span>
54+
<span><?= $escaper->escapeHtml(__('Change Password')) ?></span>
5455
</label>
5556
</div>
5657
<?= $block->getChildHtml('fieldset_edit_info_additional') ?>
5758
</fieldset>
5859

5960
<fieldset class="fieldset password" data-container="change-email-password">
6061
<legend class="legend">
61-
<span data-title="change-email-password"><?= $block->escapeHtml(__('Change Email and Password')) ?></span>
62+
<span data-title="change-email-password"><?= $escaper->escapeHtml(__('Change Email and Password')) ?></span>
6263
</legend><br>
6364
<div class="field email required" data-container="change-email">
64-
<label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
65+
<label class="label" for="email"><span><?= $escaper->escapeHtml(__('Email')) ?></span></label>
6566
<div class="control">
6667
<input type="email" name="email" id="email" autocomplete="email" data-input="change-email"
67-
value="<?= $block->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>"
68-
title="<?= $block->escapeHtmlAttr(__('Email')) ?>"
68+
value="<?= $escaper->escapeHtmlAttr($block->getCustomer()->getEmail()) ?>"
69+
title="<?= $escaper->escapeHtmlAttr(__('Email')) ?>"
6970
class="input-text"
7071
data-validate="{required:true, 'validate-email':true}" />
7172
</div>
7273
</div>
7374
<div class="field password current required">
7475
<label class="label" for="current-password">
75-
<span><?= $block->escapeHtml(__('Current Password')) ?></span>
76+
<span><?= $escaper->escapeHtml(__('Current Password')) ?></span>
7677
</label>
7778
<div class="control">
7879
<input type="password" class="input-text" name="current_password" id="current-password"
@@ -81,28 +82,28 @@ if (!$block->getButtonLockManager()) {
8182
</div>
8283
</div>
8384
<div class="field new password required" data-container="new-password">
84-
<label class="label" for="password"><span><?= $block->escapeHtml(__('New Password')) ?></span></label>
85+
<label class="label" for="password"><span><?= $escaper->escapeHtml(__('New Password')) ?></span></label>
8586
<div class="control">
8687
<?php $minCharacterSets = $block->getRequiredCharacterClassesNumber() ?>
8788
<input type="password" class="input-text" name="password" id="password"
88-
data-password-min-length="<?= $block->escapeHtml($block->getMinimumPasswordLength()) ?>"
89-
data-password-min-character-sets="<?= $block->escapeHtml($minCharacterSets) ?>"
89+
data-password-min-length="<?= $escaper->escapeHtml($block->getMinimumPasswordLength()) ?>"
90+
data-password-min-character-sets="<?= $escaper->escapeHtml($minCharacterSets) ?>"
9091
data-input="new-password"
9192
data-validate="{required:true, 'validate-customer-password':true}"
9293
autocomplete="off" />
9394
<div id="password-strength-meter-container" data-role="password-strength-meter" aria-live="polite">
9495
<div id="password-strength-meter" class="password-strength-meter">
95-
<?= $block->escapeHtml(__('Password Strength')) ?>:
96+
<?= $escaper->escapeHtml(__('Password Strength')) ?>:
9697
<span id="password-strength-meter-label" data-role="password-strength-meter-label">
97-
<?= $block->escapeHtml(__('No Password')) ?>
98+
<?= $escaper->escapeHtml(__('No Password')) ?>
9899
</span>
99100
</div>
100101
</div>
101102
</div>
102103
</div>
103104
<div class="field confirmation password required" data-container="confirm-password">
104105
<label class="label" for="password-confirmation">
105-
<span><?= $block->escapeHtml(__('Confirm New Password')) ?></span>
106+
<span><?= $escaper->escapeHtml(__('Confirm New Password')) ?></span>
106107
</label>
107108
<div class="control">
108109
<input type="password" class="input-text" name="password_confirmation" id="password-confirmation"
@@ -121,16 +122,16 @@ if (!$block->getButtonLockManager()) {
121122

122123
<div class="actions-toolbar">
123124
<div class="primary">
124-
<button type="submit" class="action save primary" title="<?= $block->escapeHtmlAttr(__('Save')) ?>"
125+
<button type="submit" class="action save primary" title="<?= $escaper->escapeHtmlAttr(__('Save')) ?>"
125126
<?php if ($block->getButtonLockManager()->isDisabled('customer_edit_form_submit')): ?>
126127
disabled="disabled"
127128
<?php endif; ?>>
128-
<span><?= $block->escapeHtml(__('Save')) ?></span>
129+
<span><?= $escaper->escapeHtml(__('Save')) ?></span>
129130
</button>
130131
</div>
131132
<div class="secondary">
132-
<a class="action back" href="<?= $block->escapeUrl($block->getBackUrl()) ?>">
133-
<span><?= $block->escapeHtml(__('Go back')) ?></span>
133+
<a class="action back" href="<?= $escaper->escapeUrl($block->getBackUrl()) ?>">
134+
<span><?= $escaper->escapeHtml(__('Go back')) ?></span>
134135
</a>
135136
</div>
136137
</div>
@@ -174,14 +175,14 @@ $scriptString .= <<<script
174175
script;
175176
?>
176177
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
177-
<?php $changeEmailAndPasswordTitle = $block->escapeHtml(__('Change Email and Password')) ?>
178+
<?php $changeEmailAndPasswordTitle = $escaper->escapeHtml(__('Change Email and Password')) ?>
178179
<script type="text/x-magento-init">
179180
{
180181
"[data-role=change-email], [data-role=change-password]": {
181182
"changeEmailPassword": {
182-
"titleChangeEmail": "<?= $block->escapeJs($block->escapeHtml(__('Change Email'))) ?>",
183-
"titleChangePassword": "<?= $block->escapeJs($block->escapeHtml(__('Change Password'))) ?>",
184-
"titleChangeEmailAndPassword": "<?= $block->escapeJs($changeEmailAndPasswordTitle) ?>"
183+
"titleChangeEmail": "<?= $escaper->escapeJs($escaper->escapeHtml(__('Change Email'))) ?>",
184+
"titleChangePassword": "<?= $escaper->escapeJs($escaper->escapeHtml(__('Change Password'))) ?>",
185+
"titleChangeEmailAndPassword": "<?= $escaper->escapeJs($changeEmailAndPasswordTitle) ?>"
185186
}
186187
},
187188
"[data-container=new-password]": {

‎app/code/Magento/Customer/view/frontend/templates/form/forgotpassword.phtml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,29 @@ if (!$block->getButtonLockManager()) {
1515
$objectManager->get(\Magento\Framework\View\Element\ButtonLockManager::class)
1616
);
1717
}
18+
/** @var $escaper \Magento\Framework\Escaper */
1819
?>
1920
<form class="form password forget"
20-
action="<?= $block->escapeUrl($block->getUrl('*/*/forgotpasswordpost')) ?>"
21+
action="<?= $escaper->escapeUrl($block->getUrl('*/*/forgotpasswordpost')) ?>"
2122
method="post"
2223
id="form-validate"
2324
data-mage-init='{"validation":{}}'>
24-
<fieldset class="fieldset" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
25-
<div class="field note"><?= $block->escapeHtml(__('Please enter your email address below to receive a password reset link.')) ?></div>
25+
<fieldset class="fieldset" data-hasrequired="<?= $escaper->escapeHtmlAttr(__('* Required Fields')) ?>">
26+
<div class="field note"><?= $escaper->escapeHtml(__('Please enter your email address below to receive a password reset link.')) ?></div>
2627
<div class="field email required">
27-
<label for="email_address" class="label"><span><?= $block->escapeHtml(__('Email')) ?></span></label>
28+
<label for="email_address" class="label"><span><?= $escaper->escapeHtml(__('Email')) ?></span></label>
2829
<div class="control">
29-
<input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $block->escapeHtmlAttr($block->getEmailValue()) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
30+
<input type="email" name="email" alt="email" id="email_address" class="input-text" value="<?= $escaper->escapeHtmlAttr($block->getEmailValue()) ?>" data-mage-init='{"mage/trim-input":{}}' data-validate="{required:true, 'validate-email':true}">
3031
</div>
3132
</div>
3233
<?= $block->getChildHtml('form_additional_info') ?>
3334
</fieldset>
3435
<div class="actions-toolbar">
3536
<div class="primary">
36-
<button type="submit" class="action submit primary" id="send2" <?php if ($block->getButtonLockManager()->isDisabled('customer_forgot_password_form_submit')): ?> disabled="disabled" <?php endif; ?>><span><?= $block->escapeHtml(__('Reset My Password')) ?></span></button>
37+
<button type="submit" class="action submit primary" id="send2" <?php if ($block->getButtonLockManager()->isDisabled('customer_forgot_password_form_submit')): ?> disabled="disabled" <?php endif; ?>><span><?= $escaper->escapeHtml(__('Reset My Password')) ?></span></button>
3738
</div>
3839
<div class="secondary">
39-
<a class="action back" href="<?= $block->escapeUrl($block->getLoginUrl()) ?>"><span><?= $block->escapeHtml(__('Go back')) ?></span></a>
40+
<a class="action back" href="<?= $escaper->escapeUrl($block->getLoginUrl()) ?>"><span><?= $escaper->escapeHtml(__('Go back')) ?></span></a>
4041
</div>
4142
</div>
4243
</form>

0 commit comments

Comments
 (0)