Merge branch 'master' into MAGNIMEX-13-static-tests

Author: Siarhei Andreyeu

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -1233,6 +1233,9 @@ protected function _getAllBunchImages($bunch)
         foreach ($bunch as $rowData) {
             $rowData = $this->_customFieldsMapping($rowData);
             foreach ($this->_imagesArrayKeys as $image) {
+                if (empty($rowData[$image])) {
+                    continue;
+                }
                 $dispersionPath =
                     \Magento\Framework\File\Uploader::getDispretionPath($rowData[$image]);
                 $importImages = explode($this->getMultipleValueSeparator(), $rowData[$image]);

app/code/Magento/ImportExport/Model/Import/AbstractEntity.php

@@ -153,6 +153,13 @@ abstract class AbstractEntity
      */
     protected $_processedRowsCount = 0;
 
+    /**
+     * Need to log in import history
+     *
+     * @var bool
+     */
+    protected $logInHistory = false;
+
     /**
      * Rows which will be skipped during import
      *
@@ -670,6 +677,16 @@ public function isRowAllowedToImport(array $rowData, $rowNumber)
         return $this->validateRow($rowData, $rowNumber) && !isset($this->_skippedRows[$rowNumber]);
     }
 
+    /*
+    * Is import need to log in history.
+    *
+    * @return bool
+    */
+    public function isNeedToLogInHistory()
+    {
+        return $this->logInHistory;
+    }
+
     /**
      * Validate data row
      *