Merge branch 'release/5.5.6'

gantry · Dec 3, 2021 · 73b8d5c · 73b8d5c
2 parents f0cb206 + 45e7746
commit 73b8d5c
Show file tree

Hide file tree

Showing 10 changed files with 423 additions and 49 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 5.5.6
+## 12/03/2021
+
+1. [Joomla](#joomla)
+    1. [](#bugfix)
+        - Fixed menu columns disappearing when saving the menu item from Joomla (#2954)
+        - Fixed Joomla object initialization in particles (#2948)
+1. [WordPress](#wordpress)
+    1. [](#bugfix)
+        - Fixed menu error `Undefined variable: parent` (#2946)
+        - Fixed static child menus not using the correct submenu
+
 # 5.5.5
 ## 11/22/2021
 

diff --git a/composer.json b/composer.json
@@ -6,7 +6,8 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.6.20",
-        "ext-zip": "*"
+        "ext-zip": "*",
+        "ext-json": "*"
     },
     "scripts": {
         "install-deps": "bin/composer-install",

diff --git a/platforms/joomla/lib_gantry5/composer.lock b/platforms/joomla/lib_gantry5/composer.lock
diff --git a/platforms/joomla/plg_system_gantry5/forms/menu_item.xml b/platforms/joomla/plg_system_gantry5/forms/menu_item.xml
@@ -89,6 +89,17 @@
             <field name="gantry-subtitle"
                    type="text"
                    label="Subtitle"/>
+            <field name="gantry-layout"
+                   type="hidden"/>
+            <field name="gantry-visible"
+                   type="hidden"
+                   filter="bool"/>
+            <field name="gantry-columns"
+                   type="hidden"
+                   filter="raw"/>
+            <field name="gantry-columns_count"
+                   type="hidden"
+                   filter="raw"/>
             <field name="gantry-particle"
                    type="hidden"/>
             <field name="gantry-options"

diff --git a/platforms/joomla/plg_system_gantry5/gantry5.php b/platforms/joomla/plg_system_gantry5/gantry5.php
@@ -629,10 +629,14 @@ public function onContentPrepareData($context, $data)
                 Loader::setup();
 
                 $isNew = $data->parent_id === null;
-                $isGantry = !empty($data->params['gantry']) || is_array(Menu::decodeJParams($data->params));
+                $menuParams = Menu::decodeJParams($data->params);
+                $isGantry = !empty($data->params['gantry']) || is_array($menuParams);
                 if ($isNew || $isGantry) {
                     // Add default Gantry params to menu item.
-                    $data->params += Menu::encodeJParams([], false);
+                    if (null === $menuParams) {
+                        $menuParams = [];
+                    }
+                    $data->params = array_merge($data->params, Menu::encodeJParams($menuParams, false));
                 }
                 break;
         }