Merge pull request #14878 from civicrm/5.16

[civicrm-core.git] / CRM / Campaign / BAO / Query.php

diff --git a/CRM/Campaign/BAO/Query.php b/CRM/Campaign/BAO/Query.php
index 4f2f0e09a7d94e4158658e80edc24ddd47b9c469..d44e12800994b1d5ac6a2132cf7780151b299935 100644 (file)
--- a/CRM/Campaign/BAO/Query.php
+++ b/CRM/Campaign/BAO/Query.php
@@ -42,9 +42,9 @@ class CRM_Campaign_BAO_Query {
    *
    * @var array
    */
-  static $_campaignFields = NULL;
+  public static $_campaignFields = NULL;
 
-  static $_applySurveyClause = FALSE;
+  public static $_applySurveyClause = FALSE;
 
   /**
    * Function get the fields for campaign.
@@ -398,10 +398,7 @@ INNER JOIN  civicrm_custom_group grp on fld.custom_group_id = grp.id
     $dao = CRM_Core_DAO::executeQuery($query, [1 => ['Voter_Info', 'String']]);
     $customSearchFields = [];
     while ($dao->fetch()) {
-      foreach ([
-                 'ward',
-                 'precinct',
-               ] as $name) {
+      foreach (['ward', 'precinct'] as $name) {
         if (stripos($name, $dao->label) !== FALSE) {
           $fieldId = $dao->id;
           $fieldName = 'custom_' . $dao->id;
@@ -447,12 +444,13 @@ INNER JOIN  civicrm_custom_group grp on fld.custom_group_id = grp.id
    *   An array.
    * @return $voterClause as a string
    */
+
   /**
    * @param array $params
    *
    * @return array
    */
-  static public function voterClause($params) {
+  public static function voterClause($params) {
     $voterClause = [];
     $fromClause = $whereClause = NULL;
     if (!is_array($params) || empty($params)) {