Skip to content

Commit e0a299b

Browse files
ENGCOM-6223: remove script tag #25418
- Merge Pull Request #25418 from torhoehn/magento2:feature/additional-product-options - Merged commits: 1. e422942 2. 4b432f8 3. d4cae50 4. 6e36d5e
2 parents 970abcb + 6e36d5e commit e0a299b

File tree

5 files changed

+13
-11
lines changed

5 files changed

+13
-11
lines changed

app/code/Magento/Sales/Block/Order/Item/Renderer/DefaultRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ public function getFormatedOptionValue($optionValue)
182182

183183
if ($this->string->strlen($optionValue) > 55) {
184184
$result['value'] = $result['value']
185-
. ' <a href="#" class="dots tooltip toggle" onclick="return false">...</a>';
185+
. ' ...';
186186
$optionValue = nl2br($optionValue);
187187
$result = array_merge($result, ['full_view' => $optionValue]);
188188
}

app/code/Magento/Sales/view/frontend/templates/order/creditmemo/items/renderer/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?php if (!$block->getPrintStatus()) : ?>
1818
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1919
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
20-
<?= $block->escapeHtml($_formatedOptionValue['value']) ?>
20+
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
2121
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
2222
<div class="tooltip content">
2323
<dl class="item options">

app/code/Magento/Sales/view/frontend/templates/order/invoice/items/renderer/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?php if (!$block->getPrintStatus()) : ?>
1818
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1919
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
20-
<?= $block->escapeHtml($_formatedOptionValue['value']) ?>
20+
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
2121
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
2222
<div class="tooltip content">
2323
<dl class="item options">

app/code/Magento/Sales/view/frontend/templates/order/items/renderer/default.phtml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,19 @@ $_item = $block->getItem();
1616
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
1717
<?php if (!$block->getPrintStatus()) : ?>
1818
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
19-
<dd>
19+
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
20+
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
2021
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
21-
<?= $block->escapeHtml($_formatedOptionValue['full_view'], ['a']) ?>
22-
<?php else : ?>
23-
<?=$block->escapeHtml($_formatedOptionValue['value'], ['a']) ?>
22+
<div class="tooltip content">
23+
<dl class="item options">
24+
<dt><?= $block->escapeHtml($_option['label']) ?></dt>
25+
<dd><?= $block->escapeHtml($_formatedOptionValue['full_view']) ?></dd>
26+
</dl>
27+
</div>
2428
<?php endif; ?>
2529
</dd>
2630
<?php else : ?>
27-
<dd>
28-
<?= /* @noEscape */ nl2br($block->escapeHtml($_option['print_value'] ?? $_option['value'])) ?>
29-
</dd>
31+
<dd><?= $block->escapeHtml((isset($_option['print_value']) ? $_option['print_value'] : $_option['value'])) ?></dd>
3032
<?php endif; ?>
3133
<?php endforeach; ?>
3234
</dl>

app/code/Magento/Sales/view/frontend/templates/order/shipment/items/renderer/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<?php if (!$block->getPrintStatus()) : ?>
1717
<?php $_formatedOptionValue = $block->getFormatedOptionValue($_option) ?>
1818
<dd<?= (isset($_formatedOptionValue['full_view']) ? ' class="tooltip wrapper"' : '') ?>>
19-
<?= $block->escapeHtml($_formatedOptionValue['value']) ?>
19+
<?= $block->escapeHtml($_formatedOptionValue['value'], ['a', 'img']) ?>
2020
<?php if (isset($_formatedOptionValue['full_view'])) : ?>
2121
<div class="tooltip content">
2222
<dl class="item options">

0 commit comments

Comments
 (0)