X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FCampaign%2FBAO%2FQuery.php;h=52b749221ea502af435ed4de282922a33f690c7c;hb=c490a46ac4bf490d3fbb31e35d24c6b43e764f00;hp=40b572c41bb64117e75df3cb6e5d6fd9b304b72d;hpb=92893473b861ca8c0bf1461eb95f46a3ad4e4a68;p=civicrm-core.git

diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php
index 40b572c41b..52b749221e 100755
--- a/CRM/Campaign/BAO/Query.php
+++ b/CRM/Campaign/BAO/Query.php
@@ -67,6 +67,8 @@ class CRM_Campaign_BAO_Query {
   /**
    * if survey, campaign are involved, add the specific fields.
    *
+   * @param $query
+   *
    * @return void
    * @access public
    */
@@ -142,6 +144,9 @@ class CRM_Campaign_BAO_Query {
     $query->_whereTables['civicrm_campaign'] = 1;
   }
 
+  /**
+   * @param $query
+   */
   static function where(&$query) {
     //get survey clause in force,
     //only when we have survey id.
@@ -159,6 +164,10 @@ class CRM_Campaign_BAO_Query {
     }
   }
 
+  /**
+   * @param $values
+   * @param $query
+   */
   static function whereClauseSingle(&$values, &$query) {
     //get survey clause in force,
     //only when we have survey id.
@@ -205,6 +214,13 @@ class CRM_Campaign_BAO_Query {
     }
   }
 
+  /**
+   * @param $name
+   * @param $mode
+   * @param $side
+   *
+   * @return null|string
+   */
   static function from($name, $mode, $side) {
     $from = NULL;
     //get survey clause in force,
@@ -249,6 +265,12 @@ civicrm_activity_assignment.record_type_id = $assigneeID ) ";
     return $from;
   }
 
+  /**
+   * @param $mode
+   * @param bool $includeCustomFields
+   *
+   * @return array|null
+   */
   static function defaultReturnProperties($mode,
     $includeCustomFields = TRUE
   ) {
@@ -283,9 +305,20 @@ civicrm_activity_assignment.record_type_id = $assigneeID ) ";
     return $properties;
   }
 
+  /**
+   * @param $tables
+   */
   static function tableNames(&$tables) {}
+
+  /**
+   * @param $row
+   * @param $id
+   */
   static function searchAction(&$row, $id) {}
 
+  /**
+   * @param $tables
+   */
   static function info(&$tables) {
     //get survey clause in force,
     //only when we have survey id.
@@ -333,9 +366,9 @@ civicrm_activity_assignment.record_type_id = $assigneeID ) ";
     $form->add('select', 'contact_type', ts('Contact Type(s)'), $contactTypes, FALSE,
       array('id' => 'contact_type', 'multiple' => 'multiple', 'class' => 'crm-select2')
     );
-    $groups = CRM_Core_PseudoConstant::group();
+    $groups = CRM_Core_PseudoConstant::nestedGroup();
     $form->add('select', 'group', ts('Groups'), $groups, FALSE,
-      array('id' => 'group', 'multiple' => 'multiple', 'class' => 'crm-select2')
+      array('multiple' => 'multiple', 'class' => 'crm-select2')
     );
 
     $showInterviewer = FALSE;
@@ -421,6 +454,11 @@ INNER JOIN  civicrm_custom_group grp on fld.custom_group_id = grp.id
    * @return $voterClause as a string
    * @static
    */
+  /**
+   * @param array $params
+   *
+   * @return array
+   */
   static public function voterClause($params) {
     $voterClause = array();
     $fromClause = $whereClause = NULL;