Merge branch 'MC-30537' into MC-30537-1.0.0

Author: nathanjosiah

TwoFactorAuth/view/adminhtml/templates/tfa/configure.phtml

@@ -22,7 +22,8 @@ $list = $block->getProvidersList();
  )); ?>
  </p>
  <?php else: ?>
- <form class="tfa-configure-providers" method="post" action="<?= $block->escapeHtmlAttr($block->getActionUrl()) ?>">
+ <form class="tfa-configure-providers" method="post"
+ action="<?= $block->escapeHtmlAttr($block->getActionUrl()) ?>">
  <ul class="tfa-provider_list">
  <?php foreach ($list as $providerData): ?>
  <li class="tfa-provider">

TwoFactorAuth/view/adminhtml/templates/tfa/configure_later.phtml

@@ -9,7 +9,7 @@
 /** @var $escaper Magento\Framework\Escaper */
 ?>
 <div id="tfa-configure-later-container">
- <a href="#" data-post="<?= /* @noEscape */ $escaper->escapeHtmlAttr($block->getPostData())?>"><?=__(
-  'Skip this configuration until next login.'
- )?></a>
+ <a href="#"
+ data-post="<?= $escaper->escapeHtmlAttr($block->getPostData())?>"
+ ><?= $escaper->escapeHtml(__('Skip this configuration until next login.')?></a>
 </div>