Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-01-22-48-29

[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 6d864e8d3bad23ce89cc062ad5f448c6bc8a5178..1c7be5d28a89f3e7f6bd8c9af9d832af307cb49f 100644 (file)
--- a/CRM/Member/Form/Task/PDFLetterCommon.php
+++ b/CRM/Member/Form/Task/PDFLetterCommon.php
@@ -12,6 +12,12 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
    * in fixing the existing pdfLetter classes to be suitably generic
    * @access public
    *
+   * @param $form
+   * @param $membershipIDs
+   * @param $skipOnHold
+   * @param $skipDeceased
+   * @param $contactIDs
+   *
    * @return void
    */
   static function postProcessMembers(&$form, $membershipIDs, $skipOnHold, $skipDeceased, $contactIDs) {
@@ -41,11 +47,15 @@ class CRM_Member_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLett
 
   /**
    * generate htmlfor pdf letters
+   *
    * @param unknown_type $membershipIDs
    * @param unknown_type $returnProperties
    * @param unknown_type $skipOnHold
    * @param unknown_type $skipDeceased
    * @param unknown_type $messageToken
+   * @param $html_message
+   * @param $categories
+   *
    * @return unknown
    */
   static function generateHTML($membershipIDs, $returnProperties, $skipOnHold, $skipDeceased, $messageToken, $html_message, $categories) {