Merge remote-tracking branch 'origin/MAGETWO-83975' into 2.2-develop-pr34

Author: svitja

app/code/Magento/Customer/view/frontend/templates/account/link/authorization.phtml

@@ -13,7 +13,7 @@ if ($block->isLoggedIn()) {
     $dataPostParam = sprintf(" data-post='%s'", $block->getPostParams());
 }
 ?>
-<li class="authorization-link" data-label="<?= $block->escapeHtmlAttr(__('or')) ?>">
+<li class="authorization-link" data-label="<?= $block->escapeHtml(__('or')) ?>">
     <a <?= /* @noEscape */ $block->getLinkAttributes() ?><?= /* @noEscape */ $dataPostParam ?>>
         <?= $block->escapeHtml($block->getLabel()) ?>
     </a>

app/code/Magento/Customer/view/frontend/templates/form/login.phtml

@@ -19,7 +19,7 @@
               id="login-form"
               data-mage-init='{"validation":{}}'>
             <?= $block->getBlockHtml('formkey') ?>
-            <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtmlAttr(__('* Required Fields')) ?>">
+            <fieldset class="fieldset login" data-hasrequired="<?= $block->escapeHtml(__('* Required Fields')) ?>">
                 <div class="field note"><?= $block->escapeHtml(__('If you have an account, sign in with your email address.')) ?></div>
                 <div class="field email required">
                     <label class="label" for="email"><span><?= $block->escapeHtml(__('Email')) ?></span></label>

app/code/Magento/Newsletter/view/frontend/templates/subscribe.phtml

@@ -22,7 +22,7 @@
                 <label class="label" for="newsletter"><span><?= $block->escapeHtml(__('Sign Up for Our Newsletter:')) ?></span></label>
                 <div class="control">
                     <input name="email" type="email" id="newsletter"
-                                placeholder="<?= $block->escapeHtmlAttr(__('Enter your email address')) ?>"
+                                placeholder="<?= $block->escapeHtml(__('Enter your email address')) ?>"
                                 data-validate="{required:true, 'validate-email':true}"/>
                 </div>
             </div>