Merge branch 'release/4.0.12' into v4

nystudio107 · Feb 6, 2025 · 9258178 · 9258178
2 parents a428037 + 62e0faa
commit 9258178
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,13 @@
 # ImageOptimize Changelog
 
+## 4.0.12 - 2025.02.06
+## Fixed
+* Reverted `srcset` width filtering ([#416](https://github.com/nystudio107/craft-imageoptimize/pull/416)) to address ([#418](https://github.com/nystudio107/craft-imageoptimize/issues/418))
+
 ## 4.0.11 - 2025.01.13
 ## Fixed
 * Don't try to apply filters to assets that are seemingly corrupt, and have a `0` width or `0` height ([#383](https://github.com/nystudio107/craft-imageoptimize/issues/383))
-* Fixed `srcset` width filtering ([](https://github.com/nystudio107/craft-imageoptimize/pull/416))
+* Fixed `srcset` width filtering ([#416](https://github.com/nystudio107/craft-imageoptimize/pull/416))
 
 ## 4.0.10 - 2024.10.21
 ## Changed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-imageoptimize",
   "description": "Automatically create & optimize responsive image transforms, using either native Craft transforms or a service like imgix, with zero template changes.",
   "type": "craft-plugin",
-  "version": "4.0.11",
+  "version": "4.0.12",
   "keywords": [
     "craft",
     "cms",

diff --git a/src/models/OptimizedImage.php b/src/models/OptimizedImage.php
@@ -618,6 +618,8 @@ protected function getSrcsetSubsetArray(array $set, int $width, string $comparis
         if (empty($this->variantSourceWidths)) {
             return $subset;
         }
+        // Sort the arrays by numeric key
+        ksort($set, SORT_NUMERIC);
         // Sort the source widths by numeric key
         sort($this->variantSourceWidths, SORT_NUMERIC);
         foreach ($this->variantSourceWidths as $variantSourceWidth) {