Fixed an issue where AssetMate could cause a type related PHP excepti…

…on when uploading files. Bump to 2.3.1
vaersaagod · Jun 9, 2023 · 4ffe1dd · 4ffe1dd
1 parent 4831aee
commit 4ffe1dd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # AssetMate Changelog
 
+## 2.3.1 - 2023-06-10
+### Fixed
+- Fixed an issue where AssetMate could cause a type related PHP exception when uploading files  
+
 ## 2.3.0 - 2023-06-02
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "vaersaagod/assetmate",
     "description": "Protect your assets, mate!",
     "type": "craft-plugin",
-    "version": "2.3.0",
+    "version": "2.3.1",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/services/Convert.php b/src/services/Convert.php
@@ -79,8 +79,8 @@ public function getShouldConvert(string $volume): bool
         $config = AssetMate::$plugin->getSettings();
         $volumes = $config->volumes;
 
-        $defaultConfig = new VolumeSettings($volumes['*'] ?? null);
-        $volumeConfig = new VolumeSettings($volumes[$volume] ?? null);
+        $defaultConfig = new VolumeSettings($volumes['*'] ?? []);
+        $volumeConfig = new VolumeSettings($volumes[$volume] ?? []);
 
         return $volumeConfig->convertUnmanipulable ?? $defaultConfig->convertUnmanipulable ?? false;
     }