Skip to content

Commit 1c5365f

Browse files
Fixed infinite loop when loading variables
2 parents 41e7360 + 1c54c50 commit 1c5365f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Fieldtypes/AvailableVariablesFieldtype.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,19 +120,19 @@ protected function getCollectionVariables(string $collectionHandle, array $field
120120
return Collection::find($collectionHandle)?->entryBlueprints()?->first()?->fields()?->items()?->map(function ($entryField) use ($field) {
121121
$name = ($field['handle'] . ':' . ($entryField['handle'] ?? ''));
122122
$description = (($field['field']['display'] ?? '') . ': ' . ($entryField['field']['display'] ?? ($entryField['handle'] ?? '')));
123-
return $this->setFieldData($entryField, $name, $description);
123+
return $this->setFieldData($entryField, $name, $description, false);
124124
})->filter()->values()->all();
125125
}
126126

127-
protected function setFieldData(array $field, ?string $name = null, ?string $description = null): ?array
127+
protected function setFieldData(array $field, ?string $name = null, ?string $description = null, bool $recursive = true): ?array
128128
{
129129
if(!($field['handle'] ?? false) || $field['handle'] === 'parent' || !($field['field']['type'] ?? false) || !$this->fieldTypeIsEligible($field['field']['type'])) {
130130
return null;
131131
}
132132

133133
$children = [];
134134

135-
if($field['field']['type'] === 'entries') {
135+
if($field['field']['type'] === 'entries' && $recursive) {
136136
if(!isset($field['field']['collections'][0])) {
137137
return null;
138138
}

0 commit comments

Comments
 (0)