Issue #3375337: only call civi in hook if handler enabled

colemanw · Jul 18, 2023 · bb81ad1 · bb81ad1
1 parent 192a3ac
commit bb81ad1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/webform_civicrm.module b/webform_civicrm.module
@@ -191,9 +191,13 @@ function _fillCiviCRMData($data, $webformSubmission) {
     return $data;
   }
 
+  $webform = $webformSubmission->getWebform();
+  $has_webform_civicrm_handler = $webform->getHandlers(NULL, TRUE)->has('webform_civicrm');
+  if (!$has_webform_civicrm_handler) {
+    return $data;
+  }
   \Drupal::service('civicrm')->initialize();
   $utils = \Drupal::service('webform_civicrm.utils');
-  $webform = $webformSubmission->getWebform();
   foreach ($data as $key => $val) {
     $element = $webform->getElement($key);
     if ($element && !empty($val) && $element['#type'] == 'civicrm_options') {