From: Jon Goldberg <jon@megaphonetech.com>
Date: Tue, 14 Sep 2021 18:43:32 +0000 (-0400)
Subject: fix cancel button when sending an individual email
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a2b238d21fff92050ec432c3686b2967d4747079;p=civicrm-core.git

fix cancel button when sending an individual email
---

diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php
index d233dff33b..4bfa01b407 100644
--- a/CRM/Contact/Form/Task/EmailTrait.php
+++ b/CRM/Contact/Form/Task/EmailTrait.php
@@ -297,11 +297,8 @@ trait CRM_Contact_Form_Task_EmailTrait {
 
       $session = CRM_Core_Session::singleton();
       $session->replaceUserContext($url);
-      $this->addDefaultButtons(ts('Send Email'), 'upload', 'cancel');
-    }
-    else {
-      $this->addDefaultButtons(ts('Send Email'), 'upload');
     }
+    $this->addDefaultButtons(ts('Send Email'), 'upload', 'cancel');
 
     $fields = [
       'followup_assignee_contact_id' => [