Post-cleanup to bug #11397
authorMichael Stucki <michael.stucki@typo3.org>
Fri, 14 Aug 2009 16:28:49 +0000 (16:28 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Fri, 14 Aug 2009 16:28:49 +0000 (16:28 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5785 709f56b5-9817-0410-a4d7-c38de5d9e867

t3lib/class.t3lib_iconworks.php

index 60a8916..0a30553 100644 (file)
@@ -282,7 +282,7 @@ final class t3lib_iconWorks {
 
                static $cachedSkinImages = array();
 
 
                static $cachedSkinImages = array();
 
-               $imageId = md5($backPath . $src . $wHattribs . $outputMode );
+               $imageId = md5($backPath . $src . $wHattribs . $outputMode);
 
                if (isset($cachedSkinImages[$imageId])) {
                        return $cachedSkinImages[$imageId];
 
                if (isset($cachedSkinImages[$imageId])) {
                        return $cachedSkinImages[$imageId];
@@ -298,8 +298,8 @@ final class t3lib_iconWorks {
 
                                // Search for alternative icon automatically:
                        $fExt = $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['forceFileExtension'];
 
                                // Search for alternative icon automatically:
                        $fExt = $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['forceFileExtension'];
-                       $scaleFactor = ($GLOBALS['TBE_STYLES']['skinImgAutoCfg']['scaleFactor'] ? $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['scaleFactor'] : 1); // Scaling factor
-                       $lookUpName = ($fExt ? preg_replace('/\.[[:alnum:]]+$/', '', $srcKey) . '.' . $fExt : $srcKey); // Set filename to look for
+                       $scaleFactor = ($GLOBALS['TBE_STYLES']['skinImgAutoCfg']['scaleFactor']) ? $GLOBALS['TBE_STYLES']['skinImgAutoCfg']['scaleFactor'] : 1; // Scaling factor
+                       $lookUpName = ($fExt) ? preg_replace('/\.[[:alnum:]]+$/', '', $srcKey) . '.' . $fExt : $srcKey; // Set filename to look for
 
                        if ($fExt && !@is_file($GLOBALS['TBE_STYLES']['skinImgAutoCfg']['absDir'] . $lookUpName)) {
                                // fallback to original filename if icon with forced extension doesn't exists
 
                        if ($fExt && !@is_file($GLOBALS['TBE_STYLES']['skinImgAutoCfg']['absDir'] . $lookUpName)) {
                                // fallback to original filename if icon with forced extension doesn't exists