Ensure $element->descendants is an array before flattening it

miranj · Sep 12, 2023 · 4c9fd0f · 4c9fd0f
1 parent 591abbf
commit 4c9fd0f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ Release notes for the Router Craft CMS plugin.
 
 
 
+## Unreleased
+
+### Fixed
+- Improved compatibility of `relatedTo` elements' descendants on older versions of Craft and PHP.
+
+
+
 ## 1.4.1 - 2023-09-06
 
 ### Added

diff --git a/src/controllers/DefaultController.php b/src/controllers/DefaultController.php
@@ -283,7 +283,11 @@ public function actionIndex(string $template, array $variables = [], array $filt
                         if ($includeDescendants) {
                             $relatedTo['element'] = array_filter(array_merge(
                                 $relatedTo['element'],
-                                ...array_column($relatedTo['element'], 'descendants')
+                                ...array_map(function ($element) {
+                                    return is_array($element->descendants)
+                                        ? $element->descendants
+                                        : $element->descendants->ids();
+                                }, $relatedTo['element'])
                             ));
                         }