Merge forwardport of magento/magento2#11363 to 2.3-develop branch

magento-engcom-team · web-flow · commit 26f3109842ce · 2018-02-05T09:42:38.000Z
Applied pull request patch https://github.com/magento/magento2/pull/11363.patch (created by @tim-bezhashvyly) based on commit(s): 1. 4cdc133 Fixed GitHub Issues in 2.3-develop branch: - magento/magento2#6924: Magento 2.1.0 - "General system exception happened" on Import .csv (reported by @githeat)
diff --git a/app/code/Magento/ImportExport/Model/Import.php b/app/code/Magento/ImportExport/Model/Import.php
@@ -567,7 +567,6 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource
                 ProcessingError::ERROR_LEVEL_CRITICAL,
                 null,
                 null,
-                null,
                 $e->getMessage()
             );
         }

Original file line number	Diff line number	Diff line change
`@@ -567,7 +567,6 @@ public function validateSource(\Magento\ImportExport\Model\Import\AbstractSource`
`567`	`567`	`ProcessingError::ERROR_LEVEL_CRITICAL,`
`568`	`568`	`null,`
`569`	`569`	`null,`
`570`		`- null,`
`571`	`570`	`$e->getMessage()`
`572`	`571`	`);`
`573`	`572`	`}`