Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-01-18-17-02-24

[civicrm-core.git] / CRM / Member / Form / Task / PDFLetterCommon.php

diff --git a/CRM/Member/Form/Task/PDFLetterCommon.php b/CRM/Member/Form/Task/PDFLetterCommon.php
index bc48a31f74beef1740fd97bf6aedb04058c41fad..6d864e8d3bad23ce89cc062ad5f448c6bc8a5178 100644 (file)
--- a/CRM/Member/Form/Task/PDFLetterCommon.php
+++ b/CRM/Member/Form/Task/PDFLetterCommon.php
@@ -12,13 +12,23 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
    * in fixing the existing pdfLetter classes to be suitably generic
    * @access public
    *
-   * @return None
+   * @return void
    */
-  static function postProcess(&$form, $membershipIDs, $skipOnHold, $skipDeceased, $contactIDs) {
+  static function postProcessMembers(&$form, $membershipIDs, $skipOnHold, $skipDeceased, $contactIDs) {
 
-    list($formValues, $categories, $html_message, $messageToken, $returnProperties) = self::processMessageTemplate($form);
+    list($formValues, $categories, $html_message, $messageToken, $returnProperties) =
+      self::processMessageTemplate($form);
 
-    $html = self::generateHTML($membershipIDs, $returnProperties, $skipOnHold, $skipDeceased, $messageToken, $html_message, $categories);
+    $html =
+      self::generateHTML(
+        $membershipIDs,
+        $returnProperties,
+        $skipOnHold,
+        $skipDeceased,
+        $messageToken,
+        $html_message,
+        $categories
+      );
     self::createActivities($form, $html_message, $contactIDs);
 
     CRM_Utils_PDF_Utils::html2pdf($html, "CiviLetter.pdf", FALSE, $formValues);
@@ -41,7 +51,8 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
   static function generateHTML($membershipIDs, $returnProperties, $skipOnHold, $skipDeceased, $messageToken, $html_message, $categories) {
     $memberships = CRM_Utils_Token::getMembershipTokenDetails($membershipIDs);
 
-    foreach ($memberships as $membershipID => $membership) {
+    foreach ($membershipIDs as $membershipID) {
+      $membership = $memberships[$membershipID];
       // get contact information
       $contactId = $membership['contact_id'];
       $params = array('contact_id' => $contactId);