[TASK] Remove check to non existing folder in IconUtility::makeIcon 62/40962/2
authorWouter Wolters <typo3@wouterwolters.nl>
Tue, 7 Jul 2015 15:06:55 +0000 (17:06 +0200)
committerAndreas Fernandez <typo3@scripting-base.de>
Tue, 7 Jul 2015 16:07:14 +0000 (18:07 +0200)
This folder never existed in TYPO3

Resolves: #67959
Releases: master
Change-Id: Ia1fd6c9b3fc350337ecf29ecfbe04ed2efbc6111
Reviewed-on: http://review.typo3.org/40962
Reviewed-by: Stephan GroƟberndt <stephan@grossberndt.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/sysext/backend/Classes/Utility/IconUtility.php

index bc3df73..1251b6f 100644 (file)
@@ -366,10 +366,7 @@ class IconUtility {
                $iconFileName = 'icon_' . GeneralUtility::shortMD5(($iconfile . '|' . $mode . '|-' . $user . '|' . $protectSection)) . '_' . $iconFileName_stateTagged . '.' . ($GLOBALS['TYPO3_CONF_VARS']['GFX']['gdlib_png'] ? 'png' : 'gif');
                $mainpath = '../typo3temp/' . $iconFileName;
                $path = PATH_site . 'typo3temp/' . $iconFileName;
-               if (file_exists(PATH_typo3 . 'icons/' . $iconFileName)) {
-                       // Returns if found in typo3/icons/
-                       return 'icons/' . $iconFileName;
-               } elseif (file_exists($path)) {
+               if (file_exists($path)) {
                        // Returns if found in ../typo3temp/icons/
                        return $mainpath;
                } else {