tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX Ensure DataList::eagerLoad() returns a clone (#10899)

Browse Source
This commit is contained in:
Guy Sartorelli 2023-08-04 12:04:20 +12:00 committed by GitHub
parent 3628cec1f3
commit c9f48089c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ORM/DataList.php
View File

@ -1478,9 +1478,10 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li
*/ */
public function eagerLoad(...$relationChains): static public function eagerLoad(...$relationChains): static
{ {
$list = clone $this;
foreach ($relationChains as $relationChain) { foreach ($relationChains as $relationChain) {
// Don't add any relations we've added before // Don't add any relations we've added before
if (array_key_exists($relationChain, $this->eagerLoadAllRelations)) { if (array_key_exists($relationChain, $list->eagerLoadAllRelations)) {
continue; continue;
} }
$parts = explode('.', $relationChain); $parts = explode('.', $relationChain);
@ -1496,15 +1497,15 @@ class DataList extends ViewableData implements SS_List, Filterable, Sortable, Li
foreach ($parts as $part) { foreach ($parts as $part) {
$usedParts[] = $part; $usedParts[] = $part;
$item = implode('.', $usedParts); $item = implode('.', $usedParts);
unset($this->eagerLoadRelationChains[$item]); unset($list->eagerLoadRelationChains[$item]);
// Keep track of what we've seen before so we don't accidentally add a level 1 relation // Keep track of what we've seen before so we don't accidentally add a level 1 relation
// (e.g. "Players") to the chains list when we already have it as part of a longer chain // (e.g. "Players") to the chains list when we already have it as part of a longer chain
// (e.g. "Players.Teams") // (e.g. "Players.Teams")
$this->eagerLoadAllRelations[$item] = $item; $list->eagerLoadAllRelations[$item] = $item;
} }
$this->eagerLoadRelationChains[$relationChain] = $relationChain; $list->eagerLoadRelationChains[$relationChain] = $relationChain;
} }
return $this; return $list;
} }
/** /**