Skip to content

Commit 234e517

Browse files
author
Hwashiang Yu
committed
MAGETWO-98235: Incorrect customer html address template
- Updated personal info and address templates - Updated translation file - Add label on allowed tags
1 parent 50e7169 commit 234e517

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
@@ -261,6 +261,7 @@
261261
</field>
262262
<field id="html" type="textarea" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
263263
<label>HTML</label>
264+
<comment>Only 'b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul' tags are allowed</comment>
264265
</field>
265266
<field id="pdf" type="textarea" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
266267
<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
@@ -480,6 +480,7 @@ Password:,Password:
480480
"Address Templates","Address Templates"
481481
"Online Customers Options","Online Customers Options"
482482
"Online Minutes Interval","Online Minutes Interval"
483+
"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"
483484
"Leave empty for default (15 minutes).","Leave empty for default (15 minutes)."
484485
"Enable Autocomplete on login/forgot password forms","Enable Autocomplete on login/forgot password forms"
485486
"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
@@ -15,9 +15,7 @@ $lastLoginDateStore = $block->getStoreLastLoginDate();
1515

1616
$createDateAdmin = $block->getCreateDate();
1717
$createDateStore = $block->getStoreCreateDate();
18-
$allowedAddressHtmlTags = ['abbr', 'b', 'blockquote', 'br', 'code', 'dd', 'del', 'dl', 'dt', 'em',
19-
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'kbd', 'li', 'ol', 'p', 'pre', 's', 'strike',
20-
'strong', 'sub', 'sup', 'ul'];
18+
$allowedAddressHtmlTags = ['b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul'];
2119
?>
2220

2321
<div class="fieldset-wrapper customer-information">

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
@@ -24,9 +24,7 @@ $orderStoreDate = $block->formatDate(
2424
true,
2525
$block->getTimezoneForStore($order->getStore())
2626
);
27-
$allowedAddressHtmlTags = ['abbr', 'b', 'blockquote', 'br', 'code', 'dd', 'del', 'dl', 'dt', 'em',
28-
'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'i', 'kbd', 'li', 'ol', 'p', 'pre', 's', 'strike',
29-
'strong', 'sub', 'sup', 'ul'];
27+
$allowedAddressHtmlTags = ['b', 'br', 'em', 'i', 'li', 'ol', 'p', 'strong', 'sub', 'sup', 'ul'];
3028
?>
3129

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

0 commit comments

Comments
 (0)