Commit 3185fc59 authored by Christian Kuhn's avatar Christian Kuhn
Browse files

[TASK] Remove dead flex form related code in DataHandler

TYPO3_CONF_VARS BE/flexFormXMLincludeDiffBase and
"vDEFbase" has been removed in v7. Drop a left over.

Change-Id: Ia6092f44970daea556042c380e308c727c576f4a
Resolves: #95252
Related: #70138
Releases: master

Tested-by: core-ci's avatarcore-ci <>
Tested-by: Oliver Bartsch's avatarOliver Bartsch <>
Tested-by: Björn Jacob's avatarBjörn Jacob <>
Tested-by: Christian Kuhn's avatarChristian Kuhn <>
Reviewed-by: Oliver Bartsch's avatarOliver Bartsch <>
Reviewed-by: Björn Jacob's avatarBjörn Jacob <>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <>
parent e5dbc1e7
......@@ -3028,24 +3028,6 @@ class DataHandler implements LoggerAwareInterface
if (isset($res['value'])) {
$dataValues[$key][$vKey] = $res['value'];
// Finally, check if new and old values are different (or no .vDEFbase value is found) and if so, we record the vDEF value for diff'ing.
// We do this after $dataValues has been updated since I expect that $dataValues_current holds evaluated values from database (so this must be the right value to compare with).
if (mb_substr($vKey, -9) !== '.vDEFbase') {
if (($GLOBALS['TYPO3_CONF_VARS']['BE']['flexFormXMLincludeDiffBase'] ?? false)
&& $vKey !== 'vDEF'
&& ((string)$dataValues[$key][$vKey] !== (string)$dataValues_current[$key][$vKey] || !isset($dataValues_current[$key][$vKey . '.vDEFbase']))
) {
// Now, check if a vDEF value is submitted in the input data, if so we expect this has been processed prior to this operation (normally the case since those fields are higher in the form) and we can use that:
if (isset($dataValues[$key]['vDEF'])) {
$diffValue = $dataValues[$key]['vDEF'];
} else {
// If not found (for translators with no access to the default language) we use the one from the current-value data set:
$diffValue = $dataValues_current[$key]['vDEF'];
// Setting the reference value for vDEF for this translation. This will be used for translation tools to make a diff between the vDEF and vDEFbase to see if an update would be fitting.
$dataValues[$key][$vKey . '.vDEFbase'] = $diffValue;
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