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

nathanjosiah · nathanjosiah · commit 395882f5364a · 2020-05-25T10:29:17.000-05:00
diff --git a/TwoFactorAuth/Test/Unit/Model/Config/Backend/ForceProvidersTest.php b/TwoFactorAuth/Test/Unit/Model/Config/Backend/ForceProvidersTest.php
@@ -1,7 +1,5 @@
 <?php
 /**
- * Compiler test. Check compilation of DI definitions and code generation
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
diff --git a/TwoFactorAuth/view/adminhtml/templates/tfa/provider/configure.phtml b/TwoFactorAuth/view/adminhtml/templates/tfa/provider/configure.phtml
@@ -11,7 +11,7 @@
 <script type="text/x-magento-init">
 {
     "#tfa-configure-container": {
-        "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>
+        "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>
     }
 }
 </script>

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`<script type="text/x-magento-init">`
`12`	`12`	`{`
`13`	`13`	`"#tfa-configure-container": {`
`14`		`- "Magento_Ui/js/core/app": <?= /* @escapeNotVerified */ $block->getJsLayout() ?>`
	`14`	`+ "Magento_Ui/js/core/app": <?= /* @noEscape */ $block->getJsLayout() ?>`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`</script>`