Fixed bug #15663: SpriteGenerator adds empty folder to spritebase, which results...

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@8777 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 2da8884..e4575d4 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-09-12  Steffen Kamper  <steffen@typo3.org>
 
+       * Fixed bug #15663: SpriteGenerator adds empty folder to spritebase, which results in wrong css (Thanks to Steffen Ritter)
        * Fixed bug #15390: sys_action taskcenter create/edit be-user actions do not work (Thanks to Georg Ringer)
 
 2010-09-09  Dmitry Dulepov  <dmitry@typo3.org>

diff --git a/t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php b/t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php
index 24cfa05..232f11d 100644 (file)
--- a/t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php
+++ b/t3lib/spritemanager/class.t3lib_spritemanager_spritegenerator.php
@@ -534,7 +534,7 @@ class t3lib_spritemanager_SpriteGenerator {
                foreach ($subFolders as $folder) {\r
                        if ($folder !== '.svn') {\r
                                $icons = t3lib_div::getFilesInDir(PATH_site . $directoryPath . $folder . '/', 'gif,png,jpg');\r
-                               if (!in_array($folder, $this->spriteBases) && count($icons)) {\r
+                               if (!in_array($folder, $this->spriteBases) && count($icons) && $folder !== '') {\r
                                        $this->spriteBases[] = $folder;\r
                                }\r
                                foreach ($icons AS $icon) {\r