Merge pull request #21474 from MegaphoneJon/core-2318

fixes core#2318: fix cancel button when sending an individual email
civicrm · Sep 14, 2021 · 8761e15 · 8761e15
2 parents 19d41af + a2b238d
commit 8761e15
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/CRM/Contact/Form/Task/EmailTrait.php b/CRM/Contact/Form/Task/EmailTrait.php
@@ -297,11 +297,8 @@ public function buildQuickForm() {
 
       $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' => [