Commit f9700c9e authored by Carsten  Rose's avatar Carsten Rose

Merge remote-tracking branch 'origin/master'

parents 161f4950 863b31c8
Pipeline #2823 passed with stages
in 2 minutes and 39 seconds
......@@ -570,12 +570,11 @@ class Save {
$this->store->setVar(SYSTEM_FORM_ELEMENT, "Column: " . $formElement[FE_NAME], STORE_SYSTEM);
if (empty($formElement[FE_MODE_SQL])) {
$mode = $formElement[FE_MODE];
} else {
$mode = $this->evaluate->parse($formElement[FE_MODE_SQL]);
$this->feSpecNative[$key][FE_MODE_SQL] = $mode;
}
// Normalize FE_MODE
$mode = Support::handleEscapeSpaceComment($formElement[FE_MODE_SQL]);
$mode = empty($mode) ? $formElement[FE_MODE] : $this->evaluate->parse($mode);
$this->feSpecNative[$key][FE_MODE] = $formElement[FE_MODE] = $mode;
$this->feSpecNative[$key][FE_MODE_SQL] = $formElement[FE_MODE_SQL] = '';
if (isset($formElement[FE_ACCEPT_ZERO_AS_REQUIRED]) && $formElement[FE_ACCEPT_ZERO_AS_REQUIRED] != '0' &&
isset($clientValues[$formElement[FE_NAME]]) && $clientValues[$formElement[FE_NAME]] == '0') {
......@@ -1211,4 +1210,5 @@ class Save {
return $slaveId;
}
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment