Skip to content

Commit d086f97

Browse files
ENGCOM-1549: Fix Magento_ImportExport not supporting unicode characters in column names #15197
2 parents 6f1199f + 681dffc commit d086f97

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

app/code/Magento/ImportExport/Model/Import/AbstractEntity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,7 @@ public function validateData()
831831
if (!$this->isAttributeParticular($columnName)) {
832832
if (trim($columnName) == '') {
833833
$emptyHeaderColumns[] = $columnNumber;
834-
} elseif (!preg_match('/^[a-z][a-z0-9_]*$/', $columnName)) {
834+
} elseif (!preg_match('/^[a-z][\w]*$/u', $columnName)) {
835835
$invalidColumns[] = $columnName;
836836
} elseif ($this->needColumnCheck && !in_array($columnName, $this->getValidColumnNames())) {
837837
$invalidAttributes[] = $columnName;

app/code/Magento/ImportExport/Model/Import/Entity/AbstractEntity.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -803,7 +803,7 @@ public function validateData()
803803
if (!$this->isAttributeParticular($columnName)) {
804804
if (trim($columnName) == '') {
805805
$emptyHeaderColumns[] = $columnNumber;
806-
} elseif (!preg_match('/^[a-z][a-z0-9_]*$/', $columnName)) {
806+
} elseif (!preg_match('/^[a-z][\w]*$/u', $columnName)) {
807807
$invalidColumns[] = $columnName;
808808
} elseif ($this->needColumnCheck && !in_array($columnName, $this->getValidColumnNames())) {
809809
$invalidAttributes[] = $columnName;

0 commit comments

Comments
 (0)