fix: Don't add image variants if no variant creator for them exists ([#…

…410](#410))
nystudio107 · Oct 9, 2024 · ab772d0 · ab772d0
1 parent 1b26260
commit ab772d0
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/services/OptimizedImages.php b/src/services/OptimizedImages.php
@@ -566,8 +566,24 @@ protected function addVariantImageToModel(Asset $asset, OptimizedImage $model, $
                 $asset,
                 $transform
             );
+            // Only add the variant URLs if a creator for them exists
+            /** @var Settings $settings */
+            $settings = ImageOptimize::$plugin->getSettings();
+            $activeImageVariantCreators = $settings->activeImageVariantCreators;
+            try {
+                $fileFormat = $asset->getFormat();
+            } catch (Throwable $e) {
+                $fileFormat = '';
+            }
+            $fileFormat = strtolower($fileFormat);
+            // Special-case for 'jpeg'
+            if ($fileFormat === 'jpeg') {
+                $fileFormat = 'jpg';
+            }
+            if (!empty($activeImageVariantCreators[$fileFormat])) {
+                $model->optimizedWebPImageUrls[$transform->width] = $webPUrl;
+            }
             //ImageOptimize::$plugin->transformMethod->prefetchRemoteFile($webPUrl);
-            $model->optimizedWebPImageUrls[$transform->width] = $webPUrl;
             $model->focalPoint = $asset->focalPoint;
             $model->originalImageWidth = $asset->width;
             $model->originalImageHeight = $asset->height;