From 7bb8c17b7adbf656fdcfb28914ac947613f96581 Mon Sep 17 00:00:00 2001
From: eileen <eileen@fuzion.co.nz>
Date: Fri, 30 Aug 2013 17:25:26 +1200
Subject: [PATCH] CRM-13296 button changes per Dave'd advice

---
 CRM/Contact/Form/Task/PDFLetterCommon.php | 12 +++++++++++-
 CRM/Member/Form/Task/PDFLetter.php        | 16 ----------------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/CRM/Contact/Form/Task/PDFLetterCommon.php b/CRM/Contact/Form/Task/PDFLetterCommon.php
index 47432ba3bb..1e9f3735a2 100644
--- a/CRM/Contact/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contact/Form/Task/PDFLetterCommon.php
@@ -190,7 +190,17 @@ class CRM_Contact_Form_Task_PDFLetterCommon {
       }
     }
     else {
-      $form->addDefaultButtons(ts('Make PDF Letters'));
+      $form->addButtons(array(
+        array(
+          'type' => 'submit',
+          'name' => ts('Make PDF Letters'),
+          'isDefault' => TRUE,
+        ),
+        array(
+          'type' => 'cancel',
+          'name' => ts('Done'),
+        ),
+      ));
     }
 
     $form->addFormRule(array('CRM_Contact_Form_Task_PDFLetterCommon', 'formRule'), $form);
diff --git a/CRM/Member/Form/Task/PDFLetter.php b/CRM/Member/Form/Task/PDFLetter.php
index f939a58bdf..673ae17907 100644
--- a/CRM/Member/Form/Task/PDFLetter.php
+++ b/CRM/Member/Form/Task/PDFLetter.php
@@ -82,23 +82,7 @@ class CRM_Member_Form_Task_PDFLetter extends CRM_Member_Form_Task {
   public function buildQuickForm() {
     //enable form element
     $this->assign('suppressForm', FALSE);
-
-    // use contact form as a base
     CRM_Contact_Form_Task_PDFLetterCommon::buildQuickForm($this);
-
-    $this->addButtons(array(
-        array(
-          'type' => 'submit',
-          'name' => ts('Make PDF Letters'),
-          'isDefault' => TRUE,
-        ),
-        array(
-          'type' => 'cancel',
-          'name' => ts('Done'),
-        ),
-      )
-    );
-
   }
 
   /**
-- 
2.25.1