Merge pull request #5100 from magento-borg/MC-29378

[CIA] Bug fixes

Author: nathanjosiah

app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml

@@ -5,16 +5,18 @@
  */
 
 /** @var \Magento\Customer\Block\CustomerData $block */
+
+// phpcs:disable Magento2.Templates.ThisInTemplate.FoundThis
 ?>
 <script type="text/x-magento-init">
     {
         "*": {
             "Magento_Customer/js/customer-data": {
-                "sectionLoadUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/section/load'))) ?>",
+                "sectionLoadUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/section/load')) ?>",
                 "expirableSectionLifetime": <?= (int)$block->getExpirableSectionLifetime() ?>,
                 "expirableSectionNames": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($block->getExpirableSectionNames()) ?>,
                 "cookieLifeTime": "<?= $block->escapeJs($block->getCookieLifeTime()) ?>",
-                "updateSessionUrl": "<?= $block->escapeJs($block->escapeUrl($block->getCustomerDataUrl('customer/account/updateSession'))) ?>"
+                "updateSessionUrl": "<?= $block->escapeJs($block->getCustomerDataUrl('customer/account/updateSession')) ?>"
             }
         }
     }