Fix an issue where draft Matrix blocks (entries) were being used for …

…submissions
verbb · Aug 27, 2024 · cde302e · cde302e
1 parent b643ec0
commit cde302e
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/services/Service.php b/src/services/Service.php
@@ -44,6 +44,11 @@ public function onBeforeSaveEntry(ModelEvent $event): void
  return;
  }
 
+ // Don't trigger for Matrix/etc which are entries
+ if ($event->sender->fieldId) {
+ return;
+ }
+
  $currentSite = Craft::$app->getSites()->getCurrentSite();
 
  // Sanitize notes first
@@ -146,6 +151,11 @@ public function onAfterSaveElement(ElementEvent $event): void
  return;
  }
 
+ // Don't trigger for Matrix/etc which are entries
+ if ($event->element->fieldId) {
+ return;
+ }
+
  $request = Craft::$app->getRequest();
  $action = $request->getBodyParam('workflow-action');