0006924_v3.patch

Administrator Admin, 2007-12-12 11:12

Download (2.5 KB)

View differences:

t3lib/class.t3lib_div.php (Arbeitskopie)
2523 2523
		$fI['dirname'].= '/';
2524 2524

  
2525 2525
			// Check parts:
2526
		if (t3lib_div::validPathStr($filepath) && $fI['basename'] && strlen($fI['basename'])<60)	{
2526
		if (t3lib_div::validPathStr($filepath) && $fI['basename'])	{
2527 2527
			if (defined('PATH_site'))	{
2528 2528
				$dirName = PATH_site.'typo3temp/';	// Setting main temporary directory name (standard)
2529 2529
				if (@is_dir($dirName))	{
......
3714 3714
			$origCharset = $csConvObj->parse_charset($csConvObj->charSetArray[$langKey] ? $csConvObj->charSetArray[$langKey] : 'iso-8859-1');
3715 3715

  
3716 3716
				// Cache file name:
3717
			$hashSource = substr($fileRef,strlen(PATH_site)).'|'.date('d-m-Y H:i:s',filemtime($fileRef)).'|version=2.2';
3717
			$hashSource = substr($fileRef,strlen(PATH_site)).'|'.date('d-m-Y H:i:s',filemtime($fileRef)).'|version=2.3';
3718 3718
			$cacheFileName = PATH_site.'typo3temp/llxml/'.
3719 3719
							#str_replace('_','',ereg_replace('^.*\/','',dirname($fileRef))).
3720 3720
							#'_'.basename($fileRef).
3721 3721
							substr(basename($fileRef),10,15).
3722
							'_'.t3lib_div::shortMD5($hashSource).'.'.$langKey.'.'.$origCharset.'.cache';
3722
							'_'.md5($hashSource).'.'.$langKey.'.'.$origCharset.'.cache';
3723 3723

  
3724 3724
				// Check if cache file exists...
3725 3725
			if (!@is_file($cacheFileName))	{	// ... if it doesn't, create content and write it:
......
3752 3752

  
3753 3753
						// If no entry is found for the language key, then force a value depending on meta-data setting. By default an automated filename will be used:
3754 3754
					$LOCAL_LANG[$langKey] = t3lib_div::llXmlAutoFileName($fileRef, $langKey);
3755
					if (!$LOCAL_LANG[$langKey] && isset($xmlContent['data'][$langKey]))	{
3755
					$localized_file = t3lib_div::getFileAbsFileName($LOCAL_LANG[$langKey]);
3756
					if (!@is_file($localized_file) && isset($xmlContent['data'][$langKey]))	{
3756 3757
						$LOCAL_LANG[$langKey] = $xmlContent['data'][$langKey];
3757 3758
					}
3758 3759

  
......
3785 3786
					$hashSource = substr($localized_file,strlen(PATH_site)).'|'.date('d-m-Y H:i:s',filemtime($localized_file));
3786 3787
					$cacheFileName = PATH_site.'typo3temp/llxml/ext_'.
3787 3788
									substr(basename($localized_file),10,15).
3788
									'_'.t3lib_div::shortMD5($hashSource).'.'.$langKey.'.'.$origCharset.'.cache';
3789
									'_'.md5($hashSource).'.'.$langKey.'.'.$origCharset.'.cache';
3789 3790

  
3790 3791
						// Check if cache file exists...
3791 3792
					if (!@is_file($cacheFileName))	{	// ... if it doesn't, create content and write it: