From 66a404ad1a83ca2f26c5f968935503306eb54578 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Wed, 24 Oct 2018 12:11:57 +1300 Subject: [PATCH] FIX use Injector for FormField::castedCopy Allows LookupField to be replaced with user specificed classes. --- src/Forms/FormField.php | 2 +- src/Forms/TreeDropdownField_Readonly.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Forms/FormField.php b/src/Forms/FormField.php index 632335391..5a9b65bef 100644 --- a/src/Forms/FormField.php +++ b/src/Forms/FormField.php @@ -1424,7 +1424,7 @@ class FormField extends RequestHandler $field = $classOrCopy; if (!is_object($field)) { - $field = new $classOrCopy($this->name); + $field = $classOrCopy::create($this->name); } $field diff --git a/src/Forms/TreeDropdownField_Readonly.php b/src/Forms/TreeDropdownField_Readonly.php index fed1a1765..c51867098 100644 --- a/src/Forms/TreeDropdownField_Readonly.php +++ b/src/Forms/TreeDropdownField_Readonly.php @@ -17,7 +17,7 @@ class TreeDropdownField_Readonly extends TreeDropdownField } $source = [ $this->value => $title ]; - $field = new LookupField($this->name, $this->title, $source); + $field = LookupField::create($this->name, $this->title, $source); $field->setValue($this->value); $field->setForm($this->form); return $field->Field();