Merge pull request civicrm#29301 from eileenmcnaughton/event_online

Fix master-only regression on saving event info when no custom data applies
totten · Feb 7, 2024 · b9c5279 · b9c5279
2 parents 1bec663 + f6af63f
commit b9c5279
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/CRM/Custom/Form/CustomDataTrait.php b/CRM/Custom/Form/CustomDataTrait.php
@@ -70,9 +70,11 @@ protected function addCustomDataFieldsToForm(string $entity, array $filters = []
           ]
         );
       }
-      $tables = CRM_Core_DAO::executeQuery(implode(' UNION ', $query));
-      while ($tables->fetch()) {
-        $customGroupSuffixes[$tables->table_name] = '_' . $tables->id;
+      if (!empty($query)) {
+        $tables = CRM_Core_DAO::executeQuery(implode(' UNION ', $query));
+        while ($tables->fetch()) {
+          $customGroupSuffixes[$tables->table_name] = '_' . $tables->id;
+        }
       }
     }