Only call getGroupACLRoles if contactID is present

diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php
index 18bc8023aa64551c2fb5908cee44c61faf17d8f8..aecd6a40cf3591b794f52c82db50c43fb2b8c7be 100644 (file)
--- a/CRM/ACL/BAO/ACL.php
+++ b/CRM/ACL/BAO/ACL.php
@@ -47,8 +47,7 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
    *   Array of assoc. arrays of ACL rules
    * @throws \CRM_Core_Exception
    */
-  protected static function getGroupACLRoles($contact_id) {
-    $contact_id = CRM_Utils_Type::escape($contact_id, 'Integer');
+  protected static function getGroupACLRoles(int $contact_id) {
 
     $query = "   SELECT          acl.*
                         FROM            civicrm_acl acl
@@ -78,26 +77,6 @@ class CRM_ACL_BAO_ACL extends CRM_ACL_DAO_ACL {
       $results[$rule->id] = $rule->toArray();
     }
 
-    // also get all acls for "Any Role" case
-    // and authenticated User Role if present
-    $roles = "0";
-    $session = CRM_Core_Session::singleton();
-    if ($session->get('ufID') > 0) {
-      $roles .= ",2";
-    }
-
-    $query = "
-SELECT acl.*
-  FROM civicrm_acl acl
- WHERE acl.entity_id      IN ( $roles )
-   AND acl.entity_table   = 'civicrm_acl_role'
-";
-
-    $rule = CRM_Core_DAO::executeQuery($query);
-    while ($rule->fetch()) {
-      $results[$rule->id] = $rule->toArray();
-    }
-
     return $results;
   }
 
@@ -141,8 +120,27 @@ SELECT      acl.*
       while ($rule->fetch()) {
         $result[$rule->id] = $rule->toArray();
       }
+      $result += self::getGroupACLRoles($contact_id);
+    }
+    // also get all acls for "Any Role" case
+    // and authenticated User Role if present
+    $roles = '0';
+    $session = CRM_Core_Session::singleton();
+    if ($session->get('ufID') > 0) {
+      $roles .= ',2';
+    }
+
+    $query = "
+SELECT acl.*
+  FROM civicrm_acl acl
+ WHERE acl.entity_id      IN ( $roles )
+   AND acl.entity_table   = 'civicrm_acl_role'
+";
+
+    $rule = CRM_Core_DAO::executeQuery($query);
+    while ($rule->fetch()) {
+      $result[$rule->id] = $rule->toArray();
     }
-    $result += self::getGroupACLRoles($contact_id);
     return $result;
   }