Merge pull request #3229 from eileenmcnaughton/e-notice

[civicrm-core.git] / CRM / Activity / Selector / Search.php

diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php
index 2bac2f3e6979248f12896886afffc2d5a4386176..76cf2269024e439bcdb12eb7c59b2f5e2143d8f3 100644 (file)
--- a/CRM/Activity/Selector/Search.php
+++ b/CRM/Activity/Selector/Search.php
@@ -147,14 +147,17 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
   /**
    * Class constructor
    *
-   * @param array   $queryParams array of parameters for query
-   * @param int     $action - action of search basic or advanced.
-   * @param string  $activityClause if the caller wants to further restrict the search (used in activities)
+   * @param array $queryParams array of parameters for query
+   * @param \const|int $action - action of search basic or advanced.
+   * @param string $activityClause if the caller wants to further restrict the search (used in activities)
    * @param boolean $single are we dealing only with one contact?
-   * @param int     $limit  how many activities do we want returned
+   * @param int $limit how many activities do we want returned
    *
-   * @return CRM_Contact_Selector
-   * @access public
+   * @param string $context
+   * @param null $compContext
+   *
+   * @return \CRM_Activity_Selector_Search
+  @access public
    */
   function __construct(&$queryParams,
     $action         = CRM_Core_Action::NONE,
@@ -192,7 +195,10 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
   /**
    * getter for array of the parameters required for creating pager.
    *
-   * @param
+   * @param $action
+   * @param $params
+   *
+   * @internal param $
    * @access public
    */
   function getPagerParams($action, &$params) {
@@ -253,7 +259,7 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
     $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts);
     $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts);
     //get all activity types
-    $activityTypes = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'name', TRUE);    
+    $activityTypes = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'name', TRUE);
 
     while ($result->fetch()) {
       $row = array();