version 3.0.13.1

verbb · Aug 12, 2020 · b3c2e47 · b3c2e47
1 parent cbd4b50
commit b3c2e47
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 3.0.13.1 - 2020-08-12
+
+### Fixed
+- Fixed potential issue with migration.
+
 ## 3.0.13 - 2020-08-12
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
  "name": "verbb/cp-nav",
  "description": "Control Panel Nav helps you managing your Control Panel navigation.",
  "type": "craft-plugin",
- "version": "3.0.13",
+ "version": "3.0.13.1",
  "keywords": [
  "craft",
  "cms",

diff --git a/src/migrations/m200812_000000_fix_layoutid.php b/src/migrations/m200812_000000_fix_layoutid.php
@@ -31,22 +31,24 @@ public function safeUp()
  // Remove `layoutId` and add `layout` for its UID
  $navs = Craft::$app->getProjectConfig()->get(NavigationsService::CONFIG_NAVIGATION_KEY);
 
- foreach ($navs as $navUid => $nav) {
- $layoutId = ArrayHelper::remove($nav, 'layoutId');
+ if (is_array($navs)) {
+ foreach ($navs as $navUid => $nav) {
+ $layoutId = ArrayHelper::remove($nav, 'layoutId');
 
- if (!$layoutId) {
- continue;
- }
+  if (!$layoutId) {
+  continue;
+  }
 
- $layout = CpNav::$plugin->getLayouts()->getLayoutById($layoutId);
+  $layout = CpNav::$plugin->getLayouts()->getLayoutById($layoutId);
 
- if (!$layout) {
- continue;
- }
+  if (!$layout) {
+  continue;
+  }
 
- $nav['layout'] = $layout->uid;
+  $nav['layout'] = $layout->uid;
 
- Craft::$app->getProjectConfig()->set(NavigationsService::CONFIG_NAVIGATION_KEY . '.' . $navUid, $nav);
+ Craft::$app->getProjectConfig()->set(NavigationsService::CONFIG_NAVIGATION_KEY . '.' . $navUid, $nav);
+ }
  }
 
  return true;

diff --git a/src/migrations/m200812_100000_layout_sortorder.php b/src/migrations/m200812_100000_layout_sortorder.php
@@ -37,10 +37,12 @@ public function safeUp()
 
  $sortOrder = 0;
 
- foreach ($layouts as $layoutUid => $layout) {
- $layout['sortOrder'] = ++$sortOrder;
+ if (is_array($layouts)) {
+ foreach ($layouts as $layoutUid => $layout) {
+ $layout['sortOrder'] = ++$sortOrder;
 
- Craft::$app->getProjectConfig()->set(LayoutsService::CONFIG_LAYOUT_KEY . '.' . $layoutUid, $layout);
+ Craft::$app->getProjectConfig()->set(LayoutsService::CONFIG_LAYOUT_KEY . '.' . $layoutUid, $layout);
+ }
  }
 
  return true;