Merge branch 'MAGETWO-43336' of github.corp.magento.com:magento-troll…

…/magento2ce into MAGETWO-43336
magento · Nov 2, 2015 · d1b250c · d1b250c
2 parents 894de50 + d9d39c4
commit d1b250c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/code/Magento/CatalogImportExport/Model/Import/Product.php b/app/code/Magento/CatalogImportExport/Model/Import/Product.php
@@ -2223,9 +2223,14 @@ private function _parseAdditionalAttributes($rowData)
 
         $attributeNameValuePairs = explode($this->getMultipleValueSeparator(), $rowData['additional_attributes']);
         foreach ($attributeNameValuePairs as $attributeNameValuePair) {
-            $nameAndValue = explode(self::PAIR_NAME_VALUE_SEPARATOR, $attributeNameValuePair);
-            if (!empty($nameAndValue)) {
-                $rowData[$nameAndValue[0]] = isset($nameAndValue[1]) ? $nameAndValue[1] : '';
+            $separatorPosition = strpos($attributeNameValuePair, self::PAIR_NAME_VALUE_SEPARATOR);
+            if ($separatorPosition !== false) {
+                $key = substr($attributeNameValuePair, 0, $separatorPosition);
+                $value = substr(
+                    $attributeNameValuePair,
+                    $separatorPosition + strlen(self::PAIR_NAME_VALUE_SEPARATOR)
+                );
+                $rowData[$key] = $value === false ? '' : $value;
             }
         }
         return $rowData;