Skip to content

Commit 81397bd

Browse files
author
Hwashiang Yu
committed
MC-14826: Incorrect customer html address template
- Updated personal info and address templates - Updated translation file - Add label on allowed tags
1 parent 10a9606 commit 81397bd

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

app/code/Magento/Customer/etc/adminhtml/system.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@
280280
</field>
281281
<field id="html" translate="label" type="textarea" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
282282
<label>HTML</label>
283+
<comment>Only 'b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul' tags are allowed</comment>
283284
</field>
284285
<field id="pdf" translate="label" type="textarea" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
285286
<label>PDF</label>

app/code/Magento/Customer/i18n/en_US.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ Strong,Strong
500500
"Address Templates","Address Templates"
501501
"Online Customers Options","Online Customers Options"
502502
"Online Minutes Interval","Online Minutes Interval"
503+
"Only 'b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul' tags are allowed","Only 'b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul' tags are allowed"
503504
"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
504505
"Customer Notification","Customer Notification"
505506
"Customer Grid","Customer Grid"

app/code/Magento/Customer/view/adminhtml/templates/tab/view/personal_info.phtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ $lastLoginDateStore = $block->getStoreLastLoginDate();
1313

1414
$createDateAdmin = $block->getCreateDate();
1515
$createDateStore = $block->getStoreCreateDate();
16-
$allowedAddressHtmlTags = ['abbr', 'b', 'blockquote', 'br', 'code', 'dd', 'del', 'dl', 'dt', 'em',
17-
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'kbd', 'li', 'ol', 'p', 'pre', 's', 'strike',
18-
'strong', 'sub', 'sup', 'ul'];
16+
$allowedAddressHtmlTags = ['b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul'];
1917
?>
2018
<div class="fieldset-wrapper customer-information">
2119
<div class="fieldset-wrapper-title">

app/code/Magento/Sales/view/adminhtml/templates/order/view/info.phtml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ $orderStoreDate = $block->formatDate(
2626
);
2727

2828
$customerUrl = $block->getCustomerViewUrl();
29-
$allowedAddressHtmlTags = ['abbr', 'b', 'blockquote', 'br', 'code', 'dd', 'del', 'dl', 'dt', 'em',
30-
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'kbd', 'li', 'ol', 'p', 'pre', 's', 'strike',
31-
'strong', 'sub', 'sup', 'ul'];
29+
$allowedAddressHtmlTags = ['b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul'];
3230
?>
3331

3432
<section class="admin__page-section order-view-account-information">

0 commit comments

Comments
 (0)