MAGETWO-80717: Fix the correct removal of the images and the removal of all images in the catalog #11153

Oleksii Korshenko · Oleksii Korshenko · commit 3e05139aaade · 2017-10-11T13:17:10.000-05:00
- Merge Pull Request magento/magento2#11153 from raumatbel/magento2:FR#RemoveImages - Merged commits: 1. 6625945 2. 39e06b0 3. 92d8418 4. 8731d97 5. 7715950 6. eba2fbd 7. 9778bfb 8. 5039c94 9. 10ef2e7
diff --git a/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php b/app/code/Magento/Catalog/Model/Product/Gallery/UpdateHandler.php
@@ -36,7 +36,7 @@ protected function processDeletedImages($product, array &$images)
                     $catalogPath = $this->mediaConfig->getBaseMediaPath();
                     $isFile = $this->mediaDirectory->isFile($catalogPath . $image['file']);
                     // only delete physical files if they are not used by any other products and if this file exist
-                    if (!($this->resourceModel->countImageUses($image['file']) > 1) && $isFile) {
+                    if ($isFile && !($this->resourceModel->countImageUses($image['file']) > 1)) {
                         $filesToDelete[] = ltrim($image['file'], '/');
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ protected function processDeletedImages($product, array &$images)`
`36`	`36`	`$catalogPath = $this->mediaConfig->getBaseMediaPath();`
`37`	`37`	`$isFile = $this->mediaDirectory->isFile($catalogPath . $image['file']);`
`38`	`38`	`// only delete physical files if they are not used by any other products and if this file exist`
`39`		`- if (!($this->resourceModel->countImageUses($image['file']) > 1) && $isFile) {`
	`39`	`+ if ($isFile && !($this->resourceModel->countImageUses($image['file']) > 1)) {`
`40`	`40`	`$filesToDelete[] = ltrim($image['file'], '/');`
`41`	`41`	`}`
`42`	`42`	`}`