2.2.1 - fix #173

craftcms · Mar 23, 2024 · a160e22 · a160e22
1 parent dd1d643
commit a160e22
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Amazon S3 for Craft CMS
 
+## 2.2.1 - 2024-03-22
+
+- Fixed an error that occurred when auto-detecting images’ focal points in Craft 5, when the volume had a subpath. ([#173](https://github.com/craftcms/aws-s3/issues/173)) 
+
 ## 2.2.0 - 2024-03-13
 
 - Uploads will now include the `x-amz-server-side-encryption: AES256` header for parity with S3 defaults. ([#172](https://github.com/craftcms/aws-s3/pull/172), [#174](https://github.com/craftcms/aws-s3/pull/174))

diff --git a/src/Plugin.php b/src/Plugin.php
@@ -57,8 +57,8 @@ public function init()
                 return;
             }
 
-            $fullPath = (method_exists($volume, 'getSubpath') ? $volume->getSubpath() : '') .
-                (!empty($filesystem->subfolder) ? rtrim($filesystem->subfolder, '/') . '/' : '') .
+            $fullPath = (!empty($filesystem->subfolder) ? rtrim($filesystem->subfolder, '/') . '/' : '') .
+                (method_exists($volume, 'getSubpath') ? $volume->getSubpath() : '') .
                 $asset->getPath();
 
             $focalPoint = $filesystem->detectFocalPoint($fullPath);