Merge pull request #291 from magento-nord/MAGETWO-35406

MAGETWO-35406 [GITHUB] check for select and multiselect to ignore corrupted attributes #1087
magento · May 15, 2015 · a0ca082 · a0ca082
2 parents 05b2964 + 66225e2
commit a0ca082
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
@@ -279,7 +279,7 @@ public function getOperationResultMessages($validationResult)
      */
     public static function getAttributeType(\Magento\Eav\Model\Entity\Attribute\AbstractAttribute $attribute)
     {
-        if ($attribute->usesSource()) {
+        if ($attribute->usesSource() && in_array($attribute->getFrontendInput(), array('select', 'multiselect'))) {
             return $attribute->getFrontendInput() == 'multiselect' ? 'multiselect' : 'select';
         } elseif ($attribute->isStatic()) {
             return $attribute->getFrontendInput() == 'date' ? 'datetime' : 'varchar';