[BUGFIX] noTrimWrap = | || won't work inside a menu

The issue is caused by the implementation of optionSplit. This patch
solves this issue by checking for noTrimWrap.

Change-Id: I1d2a6705b679c2d11433902ca992bc907e520228
Fixes: #20793
Releases: master, 6.2
Reviewed-on: http://review.typo3.org/7255


Reviewed-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Tested-by: Mathias Schreiber <mathias.schreiber@wmdb.de>
Reviewed-by: Benjamin Mack <benni@typo3.org>
Tested-by: Benjamin Mack <benni@typo3.org>

typo3/sysext/core/Classes/TypoScript/TemplateService.php

@@ -1170,7 +1170,7 @@ class TemplateService {
 					}
 				} else {
 					// Splitting of all values on this level of the TypoScript object tree:
-					if (!strstr($val, '|*|') && !strstr($val, '||')) {
+					if ($cKey === 'noTrimWrap' || (!strstr($val, '|*|') && !strstr($val, '||'))) {
 						for ($aKey = 0; $aKey < $splitCount; $aKey++) {
 							$conf2[$aKey][$cKey] = $val;
 						}