Merge remote-tracking branch 'falcon/MAGETWO-58516' into MAGETWO-59264

oshmyheliuk · oshmyheliuk · commit e4e29180310a · 2016-10-05T11:03:51.000+03:00
diff --git a/app/code/Magento/CatalogImportExport/Model/Export/Product.php b/app/code/Magento/CatalogImportExport/Model/Export/Product.php
@@ -922,7 +922,7 @@ protected function collectRawData()
                     }
                     $fieldName = isset($this->_fieldsMap[$code]) ? $this->_fieldsMap[$code] : $code;
 
-                    if ($this->_attributeTypes[$code] === Table::TYPE_DATETIME) {
+                    if ($this->_attributeTypes[$code] == 'datetime') {
                         if (in_array($code, $this->dateAttrCodes)
                             || in_array($code, $this->userDefinedAttributes)
                         ) {

Original file line number	Diff line number	Diff line change
`@@ -922,7 +922,7 @@ protected function collectRawData()`
`922`	`922`	`}`
`923`	`923`	`$fieldName = isset($this->_fieldsMap[$code]) ? $this->_fieldsMap[$code] : $code;`
`924`	`924`
`925`		`- if ($this->_attributeTypes[$code] === Table::TYPE_DATETIME) {`
	`925`	`+ if ($this->_attributeTypes[$code] == 'datetime') {`
`926`	`926`	`if (in_array($code, $this->dateAttrCodes)`
`927`	`927`	`\|\| in_array($code, $this->userDefinedAttributes)`
`928`	`928`	`) {`