Commit bdfaee6e authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fixes #9424: modeSql: skip if it starts with '#'

parent ef07e9f1
Pipeline #2821 passed with stages
in 2 minutes and 43 seconds
...@@ -570,12 +570,11 @@ class Save { ...@@ -570,12 +570,11 @@ class Save {
$this->store->setVar(SYSTEM_FORM_ELEMENT, "Column: " . $formElement[FE_NAME], STORE_SYSTEM); $this->store->setVar(SYSTEM_FORM_ELEMENT, "Column: " . $formElement[FE_NAME], STORE_SYSTEM);
if (empty($formElement[FE_MODE_SQL])) { // Normalize FE_MODE
$mode = $formElement[FE_MODE]; $mode = Support::handleEscapeSpaceComment($formElement[FE_MODE_SQL]);
} else { $mode = empty($mode) ? $formElement[FE_MODE] : $this->evaluate->parse($mode);
$mode = $this->evaluate->parse($formElement[FE_MODE_SQL]); $this->feSpecNative[$key][FE_MODE] = $formElement[FE_MODE] = $mode;
$this->feSpecNative[$key][FE_MODE_SQL] = $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' && 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') { isset($clientValues[$formElement[FE_NAME]]) && $clientValues[$formElement[FE_NAME]] == '0') {
...@@ -1211,4 +1210,5 @@ class Save { ...@@ -1211,4 +1210,5 @@ class Save {
return $slaveId; return $slaveId;
} }
} }
\ No newline at end of file
Supports Markdown
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