Fixes #7573: do FillStoreVar before slaveId

extension/Source/core/AbstractBuildForm.php

@@ -636,6 +636,12 @@ abstract class AbstractBuildForm {
             // Fill STORE_LDAP
             $fe = $this->prepareFillStoreFireLdap($fe);
 
+            if (isset($fe[FE_FILL_STORE_VAR])) {
+                $this->store->setVar(SYSTEM_FORM_ELEMENT_COLUMN, FE_FILL_STORE_VAR, STORE_SYSTEM); // debug
+                $fe[FE_FILL_STORE_VAR] = $this->evaluate->parse($fe[FE_FILL_STORE_VAR], ROW_EXPECT_0_1);
+                $this->store->appendToStore($fe[FE_FILL_STORE_VAR], STORE_VAR);
+            }
+
             // for Upload FormElements, it's necessary to pre-calculate an optional given 'slaveId'.
             if ($fe[FE_TYPE] === FE_TYPE_UPLOAD) {
                 Support::setIfNotSet($fe, FE_SLAVE_ID);
@@ -650,12 +656,6 @@ abstract class AbstractBuildForm {
             $this->store->setVar(SYSTEM_FORM_ELEMENT_COLUMN, FE_NOTE, STORE_SYSTEM); // debug
             $fe[FE_NOTE] = $this->processReportSyntax($fe[FE_NOTE]);
 
-            if (isset($fe[FE_FILL_STORE_VAR])) {
-                $this->store->setVar(SYSTEM_FORM_ELEMENT_COLUMN, FE_FILL_STORE_VAR, STORE_SYSTEM); // debug
-                $fe[FE_FILL_STORE_VAR] = $this->evaluate->parse($fe[FE_FILL_STORE_VAR], ROW_EXPECT_0_1);
-                $this->store->appendToStore($fe[FE_FILL_STORE_VAR], STORE_VAR);
-            }
-
             // ** evaluate current FormElement **
             $this->store->setVar(SYSTEM_FORM_ELEMENT_COLUMN, 'Some of the columns of current FormElement', STORE_SYSTEM); // debug
             $formElement = $this->evaluate->parseArray($fe, $skip, $debugStack);