Bug #22392 ยป 14021_v1.diff

Administrator Admin, 2010-04-07 12:17

View differences:

typo3/sysext/cms/tslib/class.tslib_content.php (working copy)
5559 5559
			if ((string)$key!='')	{
5560 5560
				$type = strtolower(trim($parts[0]));
5561 5561
				switch($type) {
5562
					case 'gp':
5563 5562
					case 'gpvar':
5564
						list($firstKey, $rest) = explode('|', $key, 2);
5565
						if (strlen(trim($firstKey)))	{
5566
							$retVal = t3lib_div::_GP(trim($firstKey));
5567
								// Look for deeper levels:
5568
							if (strlen(trim($rest)))	{
5569
								$retVal = is_array($retVal) ? $this->getGlobal($rest, $retVal) : '';
5570
							}
5571
								// Check that output is not an array:
5572
							if (is_array($retVal))	$retVal = '';
5573
						}
5574
						if ($type == 'gpvar') {
5575
							t3lib_div::deprecationLog('Using gpvar in TypoScript getText is deprecated since TYPO3 4.3 - Use gp instead of gpvar.');
5576
						}
5563
						t3lib_div::deprecationLog('Using gpvar in TypoScript getText is deprecated since TYPO3 4.3 - Use gp instead of gpvar.');
5564
						// Fall Through
5565
					case 'gp':
5566
						$retVal = $this->getGlobal($key, t3lib_div::_GET());
5577 5567
					break;
5578 5568
					case 'tsfe':
5579
						$retVal = $this->getGlobal ('TSFE|'.$key);
5569
						$retVal = $this->getGlobal ('TSFE|' . $key);
5580 5570
					break;
5581 5571
					case 'getenv':
5582 5572
						$retVal = getenv($key);
    (1-1/1)