Skip to content

Commit 874e319

Browse files
committed
Merge remote-tracking branch 'origin/MC-15919' into borg-security-2.3
2 parents 494eb9d + 61dfac8 commit 874e319

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

app/code/Magento/Customer/Model/AttributeMetadataResolver.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,12 @@ public function getAttributesMeta(
113113
// use getDataUsingMethod, since some getters are defined and apply additional processing of returning value
114114
foreach (self::$metaProperties as $metaName => $origName) {
115115
$value = $attribute->getDataUsingMethod($origName);
116-
$meta['arguments']['data']['config'][$metaName] = ($metaName === 'label') ? __($value) : $value;
116+
if ($metaName === 'label') {
117+
$meta['arguments']['data']['config'][$metaName] = __($value);
118+
$meta['arguments']['data']['config']['__disableTmpl'] = [$metaName => true];
119+
} else {
120+
$meta['arguments']['data']['config'][$metaName] = $value;
121+
}
117122
if ('frontend_input' === $origName) {
118123
$meta['arguments']['data']['config']['formElement'] = self::$formElement[$value] ?? $value;
119124
}
@@ -144,7 +149,6 @@ public function getAttributesMeta(
144149
$attribute,
145150
$meta['arguments']['data']['config']
146151
);
147-
148152
return $meta;
149153
}
150154

0 commit comments

Comments
 (0)