From 579028982c0e58aa2d327a1b7249a2fa815ba0ef Mon Sep 17 00:00:00 2001
From: Andrew Aitken-Fincham <andrew@silverstripe.com>
Date: Tue, 13 Feb 2018 14:39:37 +0000
Subject: [PATCH] fall back to CMSMain rather than LeftAndMain to getFormParent
 correctly

---
 code/Model/Recipient/EmailRecipient.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
index e26fa47..23213ab 100644
--- a/code/Model/Recipient/EmailRecipient.php
+++ b/code/Model/Recipient/EmailRecipient.php
@@ -61,7 +61,7 @@ class EmailRecipient extends DataObject
     ];
 
     private static $has_one = [
-        'Form' => DataObject::class,
+        'Form' => UserDefinedForm::class,
         'SendEmailFromField' => EditableFormField::class,
         'SendEmailToField' => EditableFormField::class,
         'SendEmailSubjectField' => EditableFormField::class
@@ -125,12 +125,12 @@ class EmailRecipient extends DataObject
     /**
      * Get instance of UserDefinedForm when editing in getCMSFields
      *
-     * @return UserDefinedFrom
+     * @return UserDefinedForm
      */
     protected function getFormParent()
     {
         // LeftAndMain::sessionNamespace is protected. @todo replace this with a non-deprecated equivalent.
-        $sessionNamespace = $this->config()->get('session_namespace') ?: LeftAndMain::class;
+        $sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class;
 
         $formID = $this->FormID
             ? $this->FormID
@@ -448,16 +448,15 @@ class EmailRecipient extends DataObject
 
     public function canView($member = null)
     {
-        if ($form = $this->Form()) {
+        if ($form = $this->getFormParent()) {
             return $form->canView($member);
         }
-
         return parent::canView($member);
     }
 
     public function canEdit($member = null)
     {
-        if ($form = $this->Form()) {
+        if ($form = $this->getFormParent()) {
             return $form->canEdit($member);
         }