Merge branch 'hotfix' of github.com:NETivism/netiCRM into hotfix

NETivism · Sep 19, 2024 · 364d0d6 · 364d0d6
2 parents 12dbb4e + 48f68db
commit 364d0d6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CRM/Contact/BAO/GroupContact.php b/CRM/Contact/BAO/GroupContact.php
@@ -450,7 +450,7 @@ static function getGroupContacts(&$group,
                       civicrm_email.email as email";
     }
     else {
-      $query = "SELECT DISTINCT(contact_a.id) as contact_id , $grpStatus as status,";
+      $query = "SELECT DISTINCT(contact_a.id) as contact_id,";
       $query .= CRM_Utils_Array::implode(',', $returnProperties);
     }
 

diff --git a/CRM/Utils/REST.php b/CRM/Utils/REST.php
@@ -634,8 +634,10 @@ static function ajax() {
   /**
    * validate sort parameter
    *
-   * @param  $sort
-   * @return void
+   * @param string $sort The sort parameter to validate. Can be a single field
+   *                     or multiple fields separated by commas (`,`), optionally
+   *                     followed by ASC or DESC.
+   * @return boolean true if valid, else false
    */
   public static function validateSortParameter($sort) {
     if (empty($sort) || !is_string($sort)) {