Merge branch 'release/5.5.14'

gantry · Jun 15, 2022 · 271e3ff · 271e3ff
2 parents d0d6173 + 6e3165b
commit 271e3ff
Show file tree

Hide file tree

Showing 15 changed files with 214 additions and 192 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 5.5.14
+## 06/15/2022
+
+1. [Common](#common)
+   1. [](#new)
+       - Implemented possibility to replace `gantry/theme.yaml` with your own in `custom/` folder (#782, #904, #2578, #3032)
+   2. [](#bugfix)
+       - Fixed `Config::flatten()` when the value is not defined or isn't an array
+2. [Joomla](#joomla)
+    1. [](#bugfix)
+        - Helium / Hydrogen: Fixed deprecated message in PHP 8.1 when `moduleclass_sfx` is not defined in a module
+
 # 5.5.13
 ## 04/29/2022
 

diff --git a/bin/builder/composer.lock b/bin/builder/composer.lock
diff --git a/platforms/grav/gantry5/compat/composer.lock b/platforms/grav/gantry5/compat/composer.lock
diff --git a/platforms/joomla/lib_gantry5/compat/composer.lock b/platforms/joomla/lib_gantry5/compat/composer.lock
diff --git a/platforms/joomla/lib_gantry5/composer.lock b/platforms/joomla/lib_gantry5/composer.lock
diff --git a/platforms/wordpress/gantry5/compat/composer.lock b/platforms/wordpress/gantry5/compat/composer.lock
diff --git a/platforms/wordpress/gantry5/composer.lock b/platforms/wordpress/gantry5/composer.lock
diff --git a/src/classes/Gantry/Component/Config/Config.php b/src/classes/Gantry/Component/Config/Config.php
@@ -180,9 +180,12 @@ public function setDefaults(array $data)
     public function flatten($name = null, $separator = '.', $prefix = '')
     {
         $element = $name ? $this->offsetGet($name) : $this->items;
+        if (null === $element) {
+            return [];
+        }
 
         if (!is_array($element)) {
-            return [$name, $element];
+            return [$name => $element];
         }
 
         if (strlen($separator) === 2 && in_array($separator, ['][', ')(', '}{'])) {

diff --git a/src/classes/Gantry/Component/Theme/ThemeDetails.php b/src/classes/Gantry/Component/Theme/ThemeDetails.php
@@ -46,7 +46,7 @@ public function __construct($theme)
         /** @var UniformResourceLocator $locator */
         $locator = $gantry['locator'];
 
-        $filename = $locator->findResource("gantry-themes://{$theme}/gantry/theme.yaml");
+        $filename = $locator->findResource("gantry-themes://{$theme}/custom/gantry/theme.yaml") ?: $locator->findResource("gantry-themes://{$theme}/gantry/theme.yaml");
         if (!$filename) {
             throw new \RuntimeException(sprintf('Theme %s not found', $theme), 404);
         }

diff --git a/themes/base/joomla/html/layouts/chromes/gantry.php b/themes/base/joomla/html/layouts/chromes/gantry.php
@@ -28,7 +28,7 @@
 
 $moduleTag              = $params->get('module_tag', 'div');
 $moduleAttribs          = [];
-$moduleAttribs['class'] = $module->position . ' moduletable ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
+$moduleAttribs['class'] = $module->position . ' moduletable ' . htmlspecialchars($params->get('moduleclass_sfx', ''), ENT_QUOTES, 'UTF-8');
 $headerTag              = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', 'g-title'), ENT_QUOTES, 'UTF-8');
 $headerAttribs          = [];

diff --git a/themes/base/joomla/html/modules.php b/themes/base/joomla/html/modules.php
@@ -31,7 +31,7 @@ function modChrome_gantry($module, &$params, &$attribs)
 	$headerClass    = ($headerClass) ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT|ENT_SUBSTITUTE, 'UTF-8') . '"' : '';
 
 	if (!empty ($module->content)) : ?>
-		<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT|ENT_SUBSTITUTE, 'UTF-8') . $moduleClass; ?>">
+		<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx', ''), ENT_COMPAT|ENT_SUBSTITUTE, 'UTF-8') . $moduleClass; ?>">
 			<?php if ((bool) $module->showtitle) : ?>
 				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
 			<?php endif; ?>

diff --git a/themes/helium/joomla/html/layouts/chromes/gantry.php b/themes/helium/joomla/html/layouts/chromes/gantry.php
@@ -28,7 +28,7 @@
 
 $moduleTag              = $params->get('module_tag', 'div');
 $moduleAttribs          = [];
-$moduleAttribs['class'] = $module->position . ' moduletable ' . htmlspecialchars($params->get('moduleclass_sfx'), ENT_QUOTES, 'UTF-8');
+$moduleAttribs['class'] = $module->position . ' moduletable ' . htmlspecialchars($params->get('moduleclass_sfx', ''), ENT_QUOTES, 'UTF-8');
 $headerTag              = htmlspecialchars($params->get('header_tag', 'h3'), ENT_QUOTES, 'UTF-8');
 $headerClass            = htmlspecialchars($params->get('header_class', 'g-title'), ENT_QUOTES, 'UTF-8');
 $headerAttribs          = [];

diff --git a/themes/helium/joomla/html/modules.php b/themes/helium/joomla/html/modules.php
@@ -31,7 +31,7 @@ function modChrome_gantry($module, &$params, &$attribs)
 	$headerClass    = ($headerClass) ? ' class="' . htmlspecialchars($headerClass, ENT_COMPAT|ENT_SUBSTITUTE, 'UTF-8') . '"' : '';
 
 	if (!empty ($module->content)) : ?>
-		<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx'), ENT_COMPAT|ENT_SUBSTITUTE, 'UTF-8') . $moduleClass; ?>">
+		<<?php echo $moduleTag; ?> class="moduletable <?php echo htmlspecialchars($params->get('moduleclass_sfx', ''), ENT_COMPAT|ENT_SUBSTITUTE, 'UTF-8') . $moduleClass; ?>">
 			<?php if ((bool) $module->showtitle) : ?>
 				<<?php echo $headerTag . $headerClass . '>' . $module->title; ?></<?php echo $headerTag; ?>>
 			<?php endif; ?>