From: Benni Mack Date: Wed, 5 Jan 2011 09:29:59 +0000 (+0000) Subject: Fixed bug #7837: Remove option if icon generation is needed X-Git-Tag: TYPO3_4-5-0beta4~63 X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/ea50b36b8e787e5914483815c84b58a5c24acb4e Fixed bug #7837: Remove option if icon generation is needed git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9987 709f56b5-9817-0410-a4d7-c38de5d9e867 --- diff --git a/ChangeLog b/ChangeLog index db8984e8c87f..0da14f938edd 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-01-05 Benjamin Mack + + * Fixed bug #7837: Remove option if icon generation is needed + 2011-01-04 Jeff Segars * Follow-up to #15853: Make admin panel styling more bulletproof and remove duplicate styles diff --git a/t3lib/class.t3lib_iconworks.php b/t3lib/class.t3lib_iconworks.php index 9c9333ff8943..7416c17812c9 100644 --- a/t3lib/class.t3lib_iconworks.php +++ b/t3lib/class.t3lib_iconworks.php @@ -168,7 +168,6 @@ final class t3lib_iconWorks { global $TCA, $PAGES_TYPES, $ICON_TYPES; // Flags: - $doNotGenerateIcon = $GLOBALS['TYPO3_CONF_VARS']['GFX']['noIconProc']; // If set, the icon will NOT be generated with GDlib. Rather the icon will be looked for as [iconfilename]_X.[extension] $doNotRenderUserGroupNumber = TRUE; // If set, then the usergroup number will NOT be printed unto the icon. NOTICE. the icon is generated only if a default icon for groups is not found... So effectively this is ineffective... // Shadow: @@ -313,13 +312,6 @@ final class t3lib_iconWorks { // Check if tagged icon file name exists (a tagget icon means the icon base name with the flags added between body and extension of the filename, prefixed with underscore) if (@is_file(dirname($absfile) . '/' . $iconFileName_stateTagged) || @is_file($GLOBALS['TBE_STYLES']['skinImgAutoCfg']['absDir'] . '/' . dirname($iconfile) . '/' . $iconFileName_stateTagged)) { // Look for [iconname]_xxxx.[ext] return dirname($iconfile) . '/' . $iconFileName_stateTagged; - } elseif ($doNotGenerateIcon) { // If no icon generation can be done, try to look for the _X icon: - $iconFileName_X = preg_replace('/.([[:alnum:]]+)$/', '__x.\1', basename($iconfile)); - if (@is_file(dirname($absfile) . '/' . $iconFileName_X)) { - return dirname($iconfile) . '/' . $iconFileName_X; - } else { - return 'gfx/i/no_icon_found.gif'; - } } else { // Otherwise, create the icon: $theRes = self::makeIcon($GLOBALS['BACK_PATH'] . $iconfile, $string, $user, $protectSection, $absfile, $iconFileName_stateTagged); return $theRes; diff --git a/t3lib/config_default.php b/t3lib/config_default.php index 3ec4e75be7cf..72a14a0c622a 100644 --- a/t3lib/config_default.php +++ b/t3lib/config_default.php @@ -27,7 +27,6 @@ $TYPO3_CONF_VARS = array( 'image_processing' => TRUE, // Boolean: Enables image processing features. Disabling this means NO image processing with either GD or IM! 'thumbnails' => TRUE, // Boolean: Enables the use of thumbnails in the backend interface. Thumbnails are generated by IM/partly GD in the file typo3/thumbs.php 'thumbnails_png' => 0, // Bits. Bit0: If set, thumbnails from non-jpegs will be 'png', otherwise 'gif' (0=gif/1=png). Bit1: Even JPG's will be converted to png or gif (2=gif/3=png) - 'noIconProc' => FALSE, // Boolean: If true, icons are never processed with overlays for hidden, starttime, endtime etc. They must be available pre-processed. If this is disabled, do so only if you have full image processing capabilities on the server for TYPO3. 'gif_compress' => TRUE, // Boolean: Enables the use of the t3lib_div::gif_compress() workaround function for compressing giffiles made with GD or IM, which probably use only RLE or no compression at all. 'imagefile_ext' => 'gif,jpg,jpeg,tif,tiff,bmp,pcx,tga,png,pdf,ai', // Commalist of file extensions perceived as images by TYPO3. List should be set to 'gif,png,jpeg,jpg' if IM is not available. Lowercase and no spaces between!