[REF] dev/core#2790 deprecate preProcessSingle

This is only called from here & is short & can just be part of the main function.

diff --git a/CRM/Contact/Form/Task/PDF.php b/CRM/Contact/Form/Task/PDF.php
index 884819bdb4f6c811b8aba0521f3f286244f7afc1..03f040bff213bbd1f3347c53b526e4cb1165f5af 100644 (file)
--- a/CRM/Contact/Form/Task/PDF.php
+++ b/CRM/Contact/Form/Task/PDF.php
@@ -58,10 +58,11 @@ class CRM_Contact_Form_Task_PDF extends CRM_Contact_Form_Task {
       // in search context 'id' is the default profile id for search display
       // CRM-11227
       $this->_activityId = CRM_Utils_Request::retrieve('id', 'Positive', $this, FALSE);
-    }
-
-    if ($cid) {
-      CRM_Contact_Form_Task_PDFLetterCommon::preProcessSingle($this, $cid);
+      $this->_contactIds = explode(',', $cid);
+      // put contact display name in title for single contact mode
+      if (count($this->_contactIds) === 1) {
+        CRM_Utils_System::setTitle(ts('Print/Merge Document for %1', [1 => CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact', $cid, 'display_name')]));
+      }
       $this->_single = TRUE;
     }
     else {
@@ -85,6 +86,8 @@ class CRM_Contact_Form_Task_PDF extends CRM_Contact_Form_Task {
 
   /**
    * Build the form object.
+   *
+   * @throws \CRM_Core_Exception
    */
   public function buildQuickForm() {
     //enable form element

diff --git a/CRM/Contact/Form/Task/PDFLetterCommon.php b/CRM/Contact/Form/Task/PDFLetterCommon.php
index bb0c2dcef54cc6b5c9116a1769f1e5ac9473034e..ce093ac680163ee0c4d79baa6a294455af5aff4b 100644 (file)
--- a/CRM/Contact/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contact/Form/Task/PDFLetterCommon.php
@@ -59,10 +59,12 @@ class CRM_Contact_Form_Task_PDFLetterCommon extends CRM_Core_Form_Task_PDFLetter
   }
 
   /**
+   * @deprecated
    * @param CRM_Core_Form $form
    * @param int $cid
    */
   public static function preProcessSingle(&$form, $cid) {
+    CRM_Core_Error::deprecatedFunctionWarning('no alternative');
     $form->_contactIds = explode(',', $cid);
     // put contact display name in title for single contact mode
     if (count($form->_contactIds) === 1) {