Merge pull request #15477 from craftcms/bugfix/15402-image-transform-…

…index retain and use image transform index id
craftcms · Aug 5, 2024 · c32da66 · c32da66
2 parents eeb924c + e1eccc2
commit c32da66
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/CHANGELOG-WIP.md b/CHANGELOG-WIP.md
@@ -30,6 +30,7 @@
 - Added `craft\filters\Cors`. ([#15397](https://github.com/craftcms/cms/pull/15397))
 - Added `craft\filters\Headers`. ([#15397](https://github.com/craftcms/cms/pull/15397))
 - Added `craft\helpers\App::configure()`.
+- Added `craft\models\ImageTransform::$indexId`.
 - Added `craft\web\View::clearAssetBundleBuffer()`.
 - Added `craft\web\View::startAssetBundleBuffer()`.
 - Added `Craft.EnvVarGenerator`.
@@ -52,3 +53,4 @@
 - Updated Axios to 0.28.1. ([#15448](https://github.com/craftcms/cms/issues/15448))
 - Fixed a bug where error messages returned by the `users/send-password-reset-email` action weren’t accounting for the `useEmailAsUsername` config setting. ([#15425](https://github.com/craftcms/cms/issues/15425))
 - Fixed a bug where `$element->isNewForSite` was always `false` from fields’ `normalizeValue()` methods when propagating an element to a new site.
+- Fixed a bug where `assets/generate-transforms` requests could generate the wrong transform, if another transform index with the same parameters existed. ([#15402](https://github.com/craftcms/cms/pull/15402), [#15477](https://github.com/craftcms/cms/pull/15477)) 
diff --git a/src/imagetransforms/ImageTransformer.php b/src/imagetransforms/ImageTransformer.php
@@ -520,6 +520,10 @@ public function getTransformIndex(Asset $asset, mixed $transform): ImageTransfor
             $query->andWhere(['format' => $transform->format]);
         }
 
+        if ($transform->indexId !== null) {
+            $query->andWhere(['id' => $transform->indexId]);
+        }
+
         $result = $query->one();
 
         if ($result) {

diff --git a/src/models/ImageTransform.php b/src/models/ImageTransform.php
@@ -113,6 +113,12 @@ class ImageTransform extends Model
      */
     protected string $transformer = self::DEFAULT_TRANSFORMER;
 
+    /**
+     * @var int|null The image transform index ID (if one was passed to the request).
+     * @since 4.11.0
+     */
+    public ?int $indexId = null;
+
     /**
      * @inheritdoc
      */

diff --git a/src/models/ImageTransformIndex.php b/src/models/ImageTransformIndex.php
@@ -151,6 +151,10 @@ public function getTransform(): ImageTransform
             $this->_transform->format = $this->format;
         }
 
+        if ($this->id) {
+            $this->_transform->indexId = $this->id;
+        }
+
         return $this->_transform;
     }