Merge pull request civicrm#26892 from artfulrobot/artfulrobot-fix-get…

…count-on-smartgroups getEntitySpecificJoins sometimes returns NULL, triggering deprecation warning for trim() in php 8.1
MegaphoneJon · Jul 21, 2023 · ef7ce49 · ef7ce49
2 parents 77d7f7b + c0ca194
commit ef7ce49
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CRM/Contact/BAO/Query.php b/CRM/Contact/BAO/Query.php
@@ -2665,7 +2665,7 @@ public static function fromClause(&$tables, $inner = NULL, $right = NULL, $prima
    * @param string $primaryLocation
    * @return string
    */
-  protected static function getEntitySpecificJoins($name, $mode, $side, $primaryLocation) {
+  protected static function getEntitySpecificJoins($name, $mode, $side, $primaryLocation): string {
     $limitToPrimaryClause = $primaryLocation ? "AND {$name}.is_primary = 1" : '';
     switch ($name) {
       case 'civicrm_address':
@@ -2727,7 +2727,7 @@ protected static function getEntitySpecificJoins($name, $mode, $side, $primaryLo
       case 'civicrm_activity_contact':
       case 'source_contact':
       case 'activity_priority':
-        return CRM_Activity_BAO_Query::from($name, $mode, $side);
+        return CRM_Activity_BAO_Query::from($name, $mode, $side) ?? '';
 
       case 'civicrm_entity_tag':
         $from = " $side JOIN civicrm_entity_tag ON ( civicrm_entity_tag.entity_table = 'civicrm_contact'";