Merge branch 'main' of github.com:jacksleight/statamic-miniset

jacksleight · May 7, 2024 · 3d36061 · 3d36061
2 parents e0317bc + 2f272ee
commit 3d36061
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,9 +1,13 @@
 # Changelog
 
-## 1.1.1 (2024-05-07)
+## 1.1.2 (2024-05-07)
 
 - Statamic 5 support
 
+## 1.1.1 (2024-02-05)
+
+* [fix] Type error when variants config is null by @caseydwyer in https://github.com/jacksleight/statamic-miniset/pull/7
+
 ## 1.1.0 (2024-02-02)
 
 * [new] Allow HTML in buttons/tabs by @caseydwyer in https://github.com/jacksleight/statamic-miniset/pull/5

diff --git a/src/Fieldtypes/MinisetClassesFieldtype.php b/src/Fieldtypes/MinisetClassesFieldtype.php
@@ -135,7 +135,7 @@ public function preload()
             'existing' => collect($this->field->value())->mapWithKeys(function ($group) {
                 return [$group['_id'] => $this->fields()->addValues($group)->meta()];
             })->toArray(),
-            'variant_indexes' => array_flip(array_keys($this->config('variants'))),
+            'variant_indexes' => array_flip(array_keys($this->config('variants') ?? [])),
         ];
     }