From b7be07f1cc745229ea2135159750256642b7bffd Mon Sep 17 00:00:00 2001
From: Fabrizio Balliano <fabrizio.balliano@gmail.com>
Date: Sat, 13 May 2023 14:03:22 +0100
Subject: [PATCH] rebase

---
 .all-contributorsrc                                      | 9 +++++++++
 .../bundle/catalog/product/view/option_tierprices.phtml  | 2 +-
 .../template/catalog/product/price_msrp_noform.phtml     | 2 +-
 .../template/catalog/product/view/tierprices.phtml       | 2 +-
 .../default/template/checkout/cart/item/default.phtml    | 2 +-
 .../default/template/checkout/cart/item/default.phtml    | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index e2ce8b9ae93..7b09f83e33e 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1382,6 +1382,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Judx",
+      "name": "Juho Hölsä",
+      "avatar_url": "https://avatars.githubusercontent.com/u/15036353?v=4",
+      "profile": "https://juhoholsa.com/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7
diff --git a/app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml b/app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml
index 2e421af6991..8ce61f4247b 100644
--- a/app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml
+++ b/app/design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml
@@ -203,7 +203,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, [1,2,4])) {
             <?php endif ?>
                 Catalog.Map.addHelpLink(
                     $('<?php echo $popupId ?>'),
-                    "<?php echo $_product->getName() ?>",
+                    "<?php echo $this->escapeHtml($_product->getName()) ?>",
                     <?php echo json_encode($_price['real_price_html']) ?>,
                     "<?php echo $this->helper('core')->currency($_product->getMsrp(),true,false) ?>",
                     newLink
diff --git a/app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml b/app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml
index c11f4ff2af8..8aa2c8a9bf8 100644
--- a/app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml
@@ -42,7 +42,7 @@
                 };
                 var newLink = Catalog.Map.addHelpLink(
                         $('<?php echo $helpLinkId ?>'),
-                        "<?php echo $_product->getName() ?>",
+                        "<?php echo $this->escapeHtml($_product->getName()) ?>",
                         <?php echo $this->getRealPriceJs($_product) ?>,
                         '<?php echo $_msrpPrice ?>',
                         productLink
diff --git a/app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml b/app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml
index a54654c626d..270c175cb6d 100644
--- a/app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml
+++ b/app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml
@@ -201,7 +201,7 @@ if (Mage::helper('weee')->typeOfDisplay($_product, [1,2,4])) {
             <?php endif ?>
                 Catalog.Map.addHelpLink(
                     $('<?php echo $popupId ?>'),
-                    "<?php echo $_product->getName() ?>",
+                    "<?php echo $this->escapeHtml($_product->getName()) ?>",
                     <?php echo json_encode($_price['real_price_html']) ?>,
                     "<?php echo $this->helper('core')->currency($_product->getMsrp(),true,false) ?>",
                     newLink
diff --git a/app/design/frontend/base/default/template/checkout/cart/item/default.phtml b/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
index efc99efc6e0..07768819542 100644
--- a/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/base/default/template/checkout/cart/item/default.phtml
@@ -78,7 +78,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
                 <?php $helpLinkId = 'cart-msrp-help-' . $_item->getId(); ?>
                 <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
                 <script type="text/javascript">
-                    Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo $this->__("What's this?") ?>");
+                    Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo Mage::helper('core')->jsQuoteEscape($this->__("What's this?")); ?>");
                 </script>
             </span>
         </td>
diff --git a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
index 10af46dd229..1a29dc4c4db 100644
--- a/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
@@ -108,7 +108,7 @@ $_deleteUrl = $this->getDeleteUrlCustom(false);
                 <a id="<?php echo $helpLinkId ?>" href="#" class="map-help-link"><?php echo $this->__("What's this?"); ?></a>
 
                 <script type="text/javascript">
-                    Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo $this->__("What&#39;s this?") ?>");
+                    Catalog.Map.addHelpLink($('<?php echo $helpLinkId ?>'), "<?php echo Mage::helper('core')->jsQuoteEscape($this->__("What's this?")); ?>");
                 </script>
 
             </span>