From 1d6abb6fc3ae7fe5df9c01f2fd3725fd0308ba1b Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Tue, 25 Feb 2020 20:32:43 +0100
Subject: [PATCH] Fixes #10177: Fill STORE_RECORD directly after form
INSERT/UPDATE - '{{id:R}}' is now usable in processing Glue inserts.
---
extension/Classes/Core/QuickFormQuery.php | 3 ---
extension/Classes/Core/Save.php | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extension/Classes/Core/QuickFormQuery.php b/extension/Classes/Core/QuickFormQuery.php
index c1008fa8c..be65b029d 100644
--- a/extension/Classes/Core/QuickFormQuery.php
+++ b/extension/Classes/Core/QuickFormQuery.php
@@ -550,9 +550,6 @@ class QuickFormQuery {
$rc = $save->process();
- // Reload fresh saved record and fill STORE_RECORD with it.
- $this->store->fillStoreWithRecord($this->formSpec[F_TABLE_NAME], $rc, $this->dbArray[$this->dbIndexData], $this->formSpec[F_PRIMARY_KEY]);
-
$save->processAllUploads($rc);
// Action: After*, Sendmail
diff --git a/extension/Classes/Core/Save.php b/extension/Classes/Core/Save.php
index 9d4b69686..fea100a40 100644
--- a/extension/Classes/Core/Save.php
+++ b/extension/Classes/Core/Save.php
@@ -309,6 +309,9 @@ class Save {
}
}
+ // Reload fresh saved record and fill STORE_RECORD with it. Do this before nativeDoSlave().
+ $this->store->fillStoreWithRecord($this->formSpec[F_TABLE_NAME], $recordId, $this->db, $this->formSpec[F_PRIMARY_KEY]);
+
$this->nativeDoSlave($recordId);
return $recordId;
--
GitLab