From b999b24b12616bde95c3c48fd96ac36fb3783dbf Mon Sep 17 00:00:00 2001 From: Duncan McClean Date: Wed, 14 Jan 2026 14:34:53 +0000 Subject: [PATCH 1/2] Fix existing field validation with prefixed fieldset imports --- src/Http/Controllers/CP/Fields/FieldsController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Http/Controllers/CP/Fields/FieldsController.php b/src/Http/Controllers/CP/Fields/FieldsController.php index ad5afa43ebc..6d59431f1dc 100644 --- a/src/Http/Controllers/CP/Fields/FieldsController.php +++ b/src/Http/Controllers/CP/Fields/FieldsController.php @@ -74,7 +74,11 @@ function ($attribute, $value, $fail) use ($request) { ->when($request->has('id'), fn ($collection) => $collection->reject(fn ($field) => $field['_id'] === $request->id)) ->flatMap(function (array $field) { if ($field['type'] === 'import') { - return Fieldset::find($field['fieldset'])->fields()->all()->map->handle()->toArray(); + return Fieldset::find($field['fieldset']) + ->fields()->all() + ->map(fn ($importedField) => ($field['prefix'] ?? '') . $importedField->handle()) + ->values() + ->toArray(); } return [$field['handle']]; From adac9534292f257b230979848626e50952f0ed17 Mon Sep 17 00:00:00 2001 From: duncanmcclean <19637309+duncanmcclean@users.noreply.github.com> Date: Wed, 14 Jan 2026 14:36:32 +0000 Subject: [PATCH 2/2] Fix styling --- src/Http/Controllers/CP/Fields/FieldsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Http/Controllers/CP/Fields/FieldsController.php b/src/Http/Controllers/CP/Fields/FieldsController.php index 6d59431f1dc..bb7b4753b48 100644 --- a/src/Http/Controllers/CP/Fields/FieldsController.php +++ b/src/Http/Controllers/CP/Fields/FieldsController.php @@ -76,7 +76,7 @@ function ($attribute, $value, $fail) use ($request) { if ($field['type'] === 'import') { return Fieldset::find($field['fieldset']) ->fields()->all() - ->map(fn ($importedField) => ($field['prefix'] ?? '') . $importedField->handle()) + ->map(fn ($importedField) => ($field['prefix'] ?? '').$importedField->handle()) ->values() ->toArray(); }