version 2.1.13.1

verbb · Feb 27, 2019 · f526a69 · f526a69
1 parent e8a7500
commit f526a69
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.1.13.1 - 2019-02-27
+
+### Fixed
+- Fix potential migration issue from 2.1.13 where some fields have no settings.
+
 ## 2.1.13 - 2019-02-27
 
 ### Fixed

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "verbb/super-table",
     "description": "Super-charge your Craft workflow with Super Table. Use it to group fields together or build complex Matrix-in-Matrix solutions.",
     "type": "craft-plugin",
-    "version": "2.1.13",
+    "version": "2.1.13.1",
     "keywords": [
         "craft",
         "cms",

diff --git a/src/migrations/m190227_000000_fix_project_config.php b/src/migrations/m190227_000000_fix_project_config.php
@@ -109,7 +109,10 @@ private function _getFieldData(): array
 
         // Massage the data and index by UID
         foreach ($fieldRows as $fieldRow) {
-            $fieldRow['settings'] = Json::decodeIfJson($fieldRow['settings']);
+            if ($fieldRow['settings']) {
+                $fieldRow['settings'] = Json::decodeIfJson($fieldRow['settings']);
+            }
+
             $fieldInstance = $fieldService->getFieldById($fieldRow['id']);
             $fieldRow['contentColumnType'] = $fieldInstance->getContentColumnType();
             $fields[$fieldRow['uid']] = $fieldRow;