8255: Export Products action doesn't consider hide_for_product_page value.

Author: nmalevanec

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

@@ -109,7 +109,8 @@ public function __construct(
     public function saveMediaGallery(array $mediaGalleryData)
     {
         $this->initMediaGalleryResources();
-        $mediaGalleryDataGlobal = $this->processMediaGallery($mediaGalleryData);
+        $mediaGalleryData = $this->restoreDisableImage($mediaGalleryData);
+        $mediaGalleryDataGlobal = array_merge(...$mediaGalleryData);
         $imageNames = [];
         $multiInsertData = [];
         $valueToProductId = [];
@@ -136,25 +137,22 @@ public function saveMediaGallery(array $mediaGalleryData)
         if (!empty($multiInsertData)) {
             $this->connection->insertOnDuplicate($this->mediaGalleryTableName, $multiInsertData);
         }
-        $multiInsertData = [];
         $newMediaSelect = $this->connection->select()->from($this->mediaGalleryTableName, ['value_id', 'value'])
             ->where('value IN (?)', $imageNames);
         if (array_keys($oldMediaValues)) {
             $newMediaSelect->where('value_id NOT IN (?)', array_keys($oldMediaValues));
         }
-
-        $dataForSkinnyTable = [];
         $newMediaValues = $this->connection->fetchAssoc($newMediaSelect);
-        $this->restoreDisableImage($mediaGalleryData);
         foreach ($mediaGalleryData as $storeId => $mediaGalleryDataPerStore) {
+            $dataForSkinnyTable = [];
+            $multiInsertData = [];
             foreach ($mediaGalleryDataPerStore as $productSku => $mediaGalleryRows) {
                 foreach ($mediaGalleryRows as $insertValue) {
                     foreach ($newMediaValues as $value_id => $values) {
                         if ($values['value'] == $insertValue['value']) {
                             $insertValue['value_id'] = $value_id;
-                            $insertValue[$this->getProductEntityLinkField()]
-                                = array_shift($valueToProductId[$values['value']]);
-                            unset($newMediaValues[$value_id]);
+                            $ids = array_values($valueToProductId[$values['value']]);
+                            $insertValue[$this->getProductEntityLinkField()] = array_shift($ids);
                             break;
                         }
                     }
@@ -175,23 +173,23 @@ public function saveMediaGallery(array $mediaGalleryData)
                     }
                 }
             }
-        }
-        try {
-            $this->connection->insertOnDuplicate(
-                $this->mediaGalleryValueTableName,
-                $multiInsertData,
-                ['value_id', 'store_id', $this->getProductEntityLinkField(), 'label', 'position', 'disabled']
-            );
-            $this->connection->insertOnDuplicate(
-                $this->mediaGalleryEntityToValueTableName,
-                $dataForSkinnyTable,
-                ['value_id']
-            );
-        } catch (\Exception $e) {
-            $this->connection->delete(
-                $this->mediaGalleryTableName,
-                $this->connection->quoteInto('value_id IN (?)', $newMediaValues)
-            );
+            try {
+                $this->connection->insertOnDuplicate(
+                    $this->mediaGalleryValueTableName,
+                    $multiInsertData,
+                    ['value_id', 'store_id', $this->getProductEntityLinkField(), 'label', 'position', 'disabled']
+                );
+                $this->connection->insertOnDuplicate(
+                    $this->mediaGalleryEntityToValueTableName,
+                    $dataForSkinnyTable,
+                    ['value_id']
+                );
+            } catch (\Exception $e) {
+                $this->connection->delete(
+                    $this->mediaGalleryTableName,
+                    $this->connection->quoteInto('value_id IN (?)', $newMediaValues)
+                );
+            }
         }
     }
 
@@ -343,24 +341,6 @@ private function restoreDisableImage(array $mediaGalleryData)
         return $mediaGalleryData;
     }
 
-    /**
-     * Remove store specific information for inserting images.
-     *
-     * @param array $mediaGalleryData
-     * @return array
-     */
-    private function processMediaGallery(array $mediaGalleryData)
-    {
-        $mediaGalleryDataGlobal = array_merge(...$mediaGalleryData);
-        foreach ($mediaGalleryDataGlobal as $sku => $row) {
-            if (isset($mediaGalleryDataGlobal[$sku]['all']['restore'])) {
-                unset($mediaGalleryDataGlobal[$sku]);
-            }
-        }
-
-        return $mediaGalleryDataGlobal;
-    }
-
     /**
      * Get product entity link field.
      *