Skip to content

Commit 77370eb

Browse files
ENGCOM-2049: [Backport] Fix Magento_ImportExport not supporting unicode characters in column names #15722
- Merge Pull Request #15722 from tdgroot/magento2:2.1-develop-PR-port-15197 - Merged commits: 1. 5111760
2 parents 76dad58 + 5111760 commit 77370eb

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
@@ -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;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ public function validateData()
769769
if (!$this->isAttributeParticular($columnName)) {
770770
if (trim($columnName) == '') {
771771
$emptyHeaderColumns[] = $columnNumber;
772-
} elseif (!preg_match('/^[a-z][a-z0-9_]*$/', $columnName)) {
772+
} elseif (!preg_match('/^[a-z][\w]*$/u', $columnName)) {
773773
$invalidColumns[] = $columnName;
774774
} elseif ($this->needColumnCheck && !in_array($columnName, $this->getValidColumnNames())) {
775775
$invalidAttributes[] = $columnName;

0 commit comments

Comments
 (0)