Merge branch '4.0' into 4.1

dnadesign · Oct 15, 2023 · 25f22c0 · 25f22c0
2 parents 34aca8c + ee48cf9
commit 25f22c0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/Control/ElementFormController.php b/src/Control/ElementFormController.php
@@ -2,6 +2,7 @@
 
 namespace DNADesign\ElementalUserForms\Control;
 
+use DNADesign\Elemental\Models\BaseElement;
 use DNADesign\Elemental\Controllers\ElementController;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
@@ -55,7 +56,11 @@ public function finished()
         $user->finished();
 
         $page = $this->getPage();
-        $controller = Injector::inst()->create($page->getControllerName(), $this->element->getPage());
+
+        while ($page instanceof BaseElement) {
+            $page = $page->getPage();
+        }
+        $controller = Injector::inst()->create($page->getControllerName(), $page->data());
         $element = $this->element;
 
         return $controller->customise([