Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-22-22-01-44

[civicrm-core.git] / tools / extensions / org.civicrm.search.activity / ActivitySearch.php

diff --git a/tools/extensions/org.civicrm.search.activity/ActivitySearch.php b/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
index 336aa10801c23add06db8e34fb8aac2a78819180..64f69b97b398a175757f6c0f7a3535d743a03b2e 100644 (file)
--- a/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
+++ b/tools/extensions/org.civicrm.search.activity/ActivitySearch.php
@@ -94,7 +94,7 @@ class org_civicrm_search_activityimplementsCRM_Contact_Form_Search_Interface {
   }
 
   /**
-   * @param $form
+   * @param CRM_Core_Form $form
    */
   function buildForm(&$form) {
 
@@ -263,11 +263,9 @@ class org_civicrm_search_activityimplementsCRM_Contact_Form_Search_Interface {
                  ON assignment.assignee_contact_id = contact_c.id ";
   }
 
-  /*
-     * WHERE clause is an array built from any required JOINS plus conditional filters based on search criteria field values
-     *
-     */
   /**
+   * WHERE clause is an array built from any required JOINS plus conditional filters based on search criteria field values
+   *
    * @param bool $includeContactIDs
    *
    * @return string
@@ -343,8 +341,9 @@ class org_civicrm_search_activityimplementsCRM_Contact_Form_Search_Interface {
   }
 
   /*
-     * Functions below generally don't need to be modified
-     */
+   * Functions below generally don't need to be modified
+   */
+
   /**
    * @return mixed
    */