Skip to content

Escape product names and translations inside js #2673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 29, 2023
Merged

Escape product names and translations inside js #2673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7be07f
rebase
fballiano May 13, 2023
214a094
Merge branch 'main' into escape-js
fballiano May 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .all-contributorsrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1401,6 +1401,15 @@
"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
}
2 changes: 1 addition & 1 deletion ...design/frontend/base/default/template/bundle/catalog/product/view/option_tierprices.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/product/price_msrp_noform.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/catalog/product/view/tierprices.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/base/default/template/checkout/cart/item/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion app/design/frontend/rwd/default/template/checkout/cart/item/default.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down