Index: typo3/sysext/cms/tslib/class.tslib_content.php =================================================================== --- typo3/sysext/cms/tslib/class.tslib_content.php (revision 6485) +++ typo3/sysext/cms/tslib/class.tslib_content.php (working copy) @@ -5343,7 +5343,11 @@ $gifCreator->init(); if ($GLOBALS['TSFE']->config['config']['meaningfulTempFilePrefix']) { - $gifCreator->filenamePrefix = $GLOBALS['TSFE']->fileNameASCIIPrefix(preg_replace('/\.[[:alnum:]]+$/','',basename($theImage)),intval($GLOBALS['TSFE']->config['config']['meaningfulTempFilePrefix']),'_'); + $filename = basename($theImage); + // remove extension + $filename = substr($filename, 0, strrpos($filename, '.')); + $gifCreator->filenamePrefix = substr($filename, 0, intval($GLOBALS['TSFE']->config['config']['meaningfulTempFilePrefix'])); + unset($filename); } if ($fileArray['sample']) { Index: typo3/sysext/cms/tslib/class.tslib_gifbuilder.php =================================================================== --- typo3/sysext/cms/tslib/class.tslib_gifbuilder.php (revision 6485) +++ typo3/sysext/cms/tslib/class.tslib_gifbuilder.php (working copy) @@ -626,10 +626,17 @@ */ function fileName($pre) { + $meaningfulPrefix = ''; + + if ($GLOBALS['TSFE']->config['config']['meaningfulTempFilePrefix']) { + $meaningfulPrefix = implode('_', array_merge($this->combinedTextStrings, $this->combinedFileNames)); + $meaningfulPrefix = substr($meaningfulPrefix, 0, intval($GLOBALS['TSFE']->config['config']['meaningfulTempFilePrefix'])); + } + // WARNING: In PHP5 I discovered that rendering with freetype of Japanese letters was totally corrupt. Not only the wrong glyphs are printed but also some memory stack overflow resulted in strange additional chars - and finally the reason for this investigation: The Bounding box data was changing all the time resulting in new images being generated all the time. With PHP4 it works fine. return $this->tempPath. $pre. - ($GLOBALS['TSFE']->config['config']['meaningfulTempFilePrefix'] ? $GLOBALS['TSFE']->fileNameASCIIPrefix(implode('_',array_merge($this->combinedTextStrings,$this->combinedFileNames)),intval($GLOBALS['TSFE']->config['config']['meaningfulTempFilePrefix']),'_') : ''). + $meaningfulPrefix . t3lib_div::shortMD5(serialize($this->setup)). '.'.$this->extension(); }