Merge branch '4.x' into bugfix/clean-session-return-url

brandonkelly · brandonkelly · commit c319813e3892 · 2025-05-05T11:30:37.000-07:00
diff --git a/src/services/Elements.php b/src/services/Elements.php
@@ -2834,6 +2834,8 @@ public function createEagerLoadingPlans(string|array $with): array
                 if (!$path->count && !$path->all) {
                     $path->all = true;
                 }
+                // ...recursively for any nested plans
+                $path->nested = $this->createEagerLoadingPlans($path->nested);
 
                 // Don't index the plan by its alias, as two plans w/ different `when` filters could be using the same alias.
                 // Side effect: mixing EagerLoadPlan objects and arrays could result in redundant element queries,

Original file line number	Diff line number	Diff line change
`@@ -2834,6 +2834,8 @@ public function createEagerLoadingPlans(string\|array $with): array`
`2834`	`2834`	`if (!$path->count && !$path->all) {`
`2835`	`2835`	`$path->all = true;`
`2836`	`2836`	`}`
	`2837`	`+ // ...recursively for any nested plans`
	`2838`	`+ $path->nested = $this->createEagerLoadingPlans($path->nested);`
`2837`	`2839`
`2838`	`2840`	// Don't index the plan by its alias, as two plans w/ different `when` filters could be using the same alias.
`2839`	`2841`	`// Side effect: mixing EagerLoadPlan objects and arrays could result in redundant element queries,`