Merge remote-tracking branch 'origin/AC-12479' into spartans_pr_02012025

Author: glo60612

app/code/Magento/CheckoutAgreements/Model/AgreementsConfigProvider.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\CheckoutAgreements\Model;
 
@@ -96,11 +96,14 @@ protected function getAgreementsConfig()
         $agreementConfiguration['isEnabled'] = (bool)($isAgreementsEnabled && count($agreementsList) > 0);
 
         foreach ($agreementsList as $agreement) {
+            $isAgreementHtmlType = $agreement->getIsHtml();
             $agreementConfiguration['agreements'][] = [
-                'content' => $agreement->getIsHtml()
+                'content' => $isAgreementHtmlType
                     ? $agreement->getContent()
                     : nl2br($this->escaper->escapeHtml($agreement->getContent())),
-                'checkboxText' => $this->escaper->escapeHtml($agreement->getCheckboxText()),
+                'checkboxText' => $isAgreementHtmlType
+                    ? $agreement->getCheckboxText()
+                    : nl2br($this->escaper->escapeHtml($agreement->getCheckboxText())),
                 'mode' => $agreement->getMode(),
                 'agreementId' => $agreement->getAgreementId(),
                 'contentHeight' => $agreement->getContentHeight()

app/code/Magento/CheckoutAgreements/Test/Unit/Model/AgreementsConfigProviderTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -88,7 +88,6 @@ public function testGetConfigIfContentIsHtml(): void
     {
         $content = 'content';
         $checkboxText = 'checkbox_text';
-        $escapedCheckboxText = 'escaped_checkbox_text';
         $mode = AgreementModeOptions::MODE_AUTO;
         $agreementId = 100;
         $contentHeight = '100px';
@@ -98,7 +97,7 @@ public function testGetConfigIfContentIsHtml(): void
                 'agreements' => [
                     [
                         'content' => $content,
-                        'checkboxText' => $escapedCheckboxText,
+                        'checkboxText' => $checkboxText,
                         'mode' => $mode,
                         'agreementId' => $agreementId,
                         'contentHeight' => $contentHeight
@@ -122,11 +121,6 @@ public function testGetConfigIfContentIsHtml(): void
             ->with($searchCriteriaMock)
             ->willReturn([$agreement]);
 
-        $this->escaperMock->expects($this->once())
-            ->method('escapeHtml')
-            ->with($checkboxText)
-            ->willReturn($escapedCheckboxText);
-
         $agreement->expects($this->once())->method('getIsHtml')->willReturn(true);
         $agreement->expects($this->once())->method('getContent')->willReturn($content);
         $agreement->expects($this->once())->method('getCheckboxText')->willReturn($checkboxText);