From 572b221126f5f603215f415811fdb83056a6bf24 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 3 Jun 2021 23:05:19 -0700
Subject: [PATCH] DAOCreateAction - Fill defaults before validating write

---
 Civi/Api4/Generic/DAOCreateAction.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Civi/Api4/Generic/DAOCreateAction.php b/Civi/Api4/Generic/DAOCreateAction.php
index 336b26be75..cf88e31910 100644
--- a/Civi/Api4/Generic/DAOCreateAction.php
+++ b/Civi/Api4/Generic/DAOCreateAction.php
@@ -33,11 +33,10 @@ class DAOCreateAction extends AbstractCreateAction {
    */
   public function _run(Result $result) {
     $this->formatWriteValues($this->values);
+    $this->fillDefaults($this->values);
     $this->validateValues();
-    $params = $this->values;
-    $this->fillDefaults($params);
-    $items = [$params];
 
+    $items = [$this->values];
     $result->exchangeArray($this->writeObjects($items));
   }
 
-- 
2.25.1