diff --git a/extension/qfq/qfq/QuickFormQuery.php b/extension/qfq/qfq/QuickFormQuery.php index a4e4388e41f9502de04810876cfef3544a7d7fcd..5e46a70d62926c345c345fe07e9e8e46ca4b011d 100644 --- a/extension/qfq/qfq/QuickFormQuery.php +++ b/extension/qfq/qfq/QuickFormQuery.php @@ -652,6 +652,10 @@ class QuickFormQuery { unset($form[FE_FILL_STORE_VAR]); } + // this is needed for filling templateGroup records with their default values + // and for evaluating variables in the Form title + $this->fillStoreWithRecord($form[F_TABLE_NAME], $recordId, STORE_RECORD); + $formSpec = $this->eval->parseArray($form); // Setting defaults later is too late. @@ -678,9 +682,6 @@ class QuickFormQuery { // Set F_FINAL_DELETE_FORM $formSpec[F_FINAL_DELETE_FORM] = ($formSpec[F_EXTRA_DELETE_FORM] != '') ? $formSpec[F_EXTRA_DELETE_FORM] : $formSpec[F_NAME]; - // this is needed for filling templateGroup records with their default values - $this->fillStoreWithRecord($formSpec[F_TABLE_NAME], $recordId, STORE_RECORD); - // Fire FE_FILL_STORE_VAR after the primary form record has been loaded if (!empty($fillStoreVar)) { $rows = $this->eval->parse($fillStoreVar);