MAGETWO-51185: Product image cannot be loaded from product page if minification enabled

Author: shiftedreality

lib/internal/Magento/Framework/View/Design/FileResolution/Fallback/Resolver/Minification.php

@@ -38,6 +38,7 @@ public function __construct(ResolverInterface $fallback, AssetMinification $mini
         $this->fallback = $fallback;
         $this->minification = $minification;
     }
+
     /**
      * Get path of file after using fallback rules
      *
@@ -52,9 +53,32 @@ public function __construct(ResolverInterface $fallback, AssetMinification $mini
     public function resolve($type, $file, $area = null, ThemeInterface $theme = null, $locale = null, $module = null)
     {
         $path = $this->fallback->resolve($type, $file, $area, $theme, $locale, $module);
-        if (!$path && $file != ($newFile = $this->minification->removeMinifiedSign($file))) {
-            $path = $this->fallback->resolve($type, $newFile, $area, $theme, $locale, $module);
+
+        /**
+         * Minified version as priority one
+         */
+        if ($path && $this->minification->isMinifiedFilename($path)) {
+            return $path;
         }
-        return $path;
+
+        /**
+         * If minification is disabled - return already found path
+         */
+        if (!$this->minification->isEnabled(pathinfo($file, PATHINFO_EXTENSION))) {
+            return $path;
+        }
+
+        /**
+         * Try to find minified version of file,
+         * or return already found path
+         */
+        return $this->fallback->resolve(
+            $type,
+            $this->minification->addMinifiedSign($file),
+            $area,
+            $theme,
+            $locale,
+            $module
+        ) ?: $path;
     }
 }

lib/internal/Magento/Framework/View/Test/Unit/Design/FileResolution/Fallback/Resolver/MinificationTest.php

@@ -72,7 +72,7 @@ public function testResolve(
             ->willReturnMap([['css', $isEnabled]]);
         $this->assetMinificationMock
             ->expects($this->any())
-            ->method('removeMinifiedSign')
+            ->method('addMinifiedSign')
             ->with($requested)
             ->willReturn($alternative);