diff --git a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php index 6852472b84c34e91bb3d140f691c192f47ed9ffd..0e8451cc883d03d6983385bec2772e8893bb702b 100644 --- a/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php +++ b/typo3/sysext/extbase/Classes/Utility/LocalizationUtility.php @@ -255,7 +255,11 @@ class LocalizationUtility $result = []; foreach ($labelValues as $key => $labelValue) { if (!empty($parentKey)) { - $key = $parentKey . '.' . $key; + if ($key === '_typoScriptNodeValue') { + $key = $parentKey; + } else { + $key = $parentKey . '.' . $key; + } } if (is_array($labelValue)) { $labelValue = self::flattenTypoScriptLabelArray($labelValue, $key); diff --git a/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php b/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php index 9e6aa7df0463a2f3659cc5ee2c06ac6c00ee3d57..f1719e8f43097a0a87795dcc457283f935ad2007 100644 --- a/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php +++ b/typo3/sysext/extbase/Tests/Unit/Utility/LocalizationUtilityTest.php @@ -195,6 +195,7 @@ class LocalizationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest $expected = [ 'key1' => 'value1', 'key2' => 'value2', + 'key3' => 'value3', 'key3.subkey1' => 'subvalue1', 'key3.subkey2.subsubkey' => 'val' ]; @@ -202,6 +203,7 @@ class LocalizationUtilityTest extends \TYPO3\TestingFramework\Core\Unit\UnitTest 'key1' => 'value1', 'key2' => 'value2', 'key3' => [ + '_typoScriptNodeValue' => 'value3', 'subkey1' => 'subvalue1', 'subkey2' => [ 'subsubkey' => 'val'