Bug. Fixes #8058. Form/fillStoreVar: broken for TemplateGroup

extension/Source/core/QuickFormQuery.php

@@ -343,16 +343,6 @@ class QuickFormQuery {
         $foundInStore = '';
         $flagApiStructureReGroup = true;
 
-        // Fill STORE_FORM
-        switch ($formMode) {
-            case FORM_UPDATE:
-            case FORM_SAVE:
-            case FORM_REST:
-                $fillStoreForm = new FillStoreForm();
-                $fillStoreForm->process($formMode);
-                break;
-        }
-
         $recordId = $this->store->getVar(SIP_RECORD_ID, STORE_SIP . STORE_TYPO3 . STORE_CLIENT . STORE_ZERO);
         $this->setParameterLanguageFieldName();
 
@@ -375,6 +365,16 @@ class QuickFormQuery {
         // Check 'session expire' happens quite late, cause it can be configured per form.
         Session::checkSessionExpired($this->formSpec[F_SESSION_TIMEOUT_SECONDS]);
 
+        // Fill STORE_FORM: might need Form.fillStoreVar={{!SELECT ...}}) to provide STORE_VAR - therefore the FORM-definition should already been processed. #8058
+        switch ($formMode) {
+            case FORM_UPDATE:
+            case FORM_SAVE:
+            case FORM_REST:
+                $fillStoreForm = new FillStoreForm();
+                $fillStoreForm->process($formMode);
+                break;
+        }
+
         if ($formName !== false) {
             // Validate (only if there is a 'real' form, not a FORM_DELETE with only a table name).
             // Attention: $formModeNew will be set