ACP2E-1479: Product with any custom option causes an error when deleting product images

Author: Chhandak.Barua

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

@@ -141,6 +141,7 @@ public function execute()
                 $originalSku = $product->getSku();
                 $canSaveCustomOptions = $product->getCanSaveCustomOptions();
                 $product->save();
+
                 $this->handleImageRemoveError($data, $product->getId());
                 $productId = $product->getEntityId();
                 $productAttributeSetId = $product->getAttributeSetId();
@@ -213,7 +214,7 @@ public function execute()
     /**
      * Notify customer when image was not deleted in specific case.
      *
-     * TODO: temporary workaround must be eliminated in MAGETWO-45306
+     * TODO: temporary workaround must be eliminated in MAGETNO-45306
      *
      * @param array $postData
      * @param int $productId
@@ -223,22 +224,15 @@ private function handleImageRemoveError($postData, $productId)
     {
         if (isset($postData['product']['media_gallery']['images'])) {
             $removedImagesAmount = 0;
-            $removedImages = [];
             foreach ($postData['product']['media_gallery']['images'] as $image) {
                 if (!empty($image['removed'])) {
                     $removedImagesAmount++;
-                    $removedImages[] = $image['value_id'];
                 }
             }
             if ($removedImagesAmount) {
                 $expectedImagesAmount = count($postData['product']['media_gallery']['images']) - $removedImagesAmount;
-                $product = $this->productRepository->getById($productId);
+                $product = $this->productRepository->getById($productId, false, null, true);
                 $images = $product->getMediaGallery('images');
-                foreach ($images as $key => $imageItem) {
-                    if (in_array($imageItem['value_id'], $removedImages)) {
-                        unset($images[$key]);
-                    }
-                }
                 if (is_array($images) && $expectedImagesAmount != count($images)) {
                     $this->messageManager->addNoticeMessage(
                         __('The image cannot be removed as it has been assigned to the other image role')