Commit d20488aa6a9fc34d26ec7fa9037877d41182bc13

Authored by Yarik
2 parents 1a17e5eb aac46b79

Merge remote-tracking branch 'origin/master'

Showing 1 changed file with 1 additions and 1 deletions   Show diff stats
common/modules/product/models/Import.php
@@ -267,7 +267,7 @@ @@ -267,7 +267,7 @@
267 $is_utf = ( preg_match( 267 $is_utf = ( preg_match(
268 '//u', 268 '//u',
269 file_get_contents( 269 file_get_contents(
270 - Yii::getAlias('@uploadDir') . '/' . Yii::getAlias('@uploadFileProducts'), 270 + Yii::getAlias('@uploadDir') . '/' . Yiiа::getAlias('@uploadFileProducts'),
271 null, 271 null,
272 null, 272 null,
273 null, 273 null,