Fixed bug #10939: Wrong nesting of <ul> <li> tags in expanded mount root in module...
authorPatrick Broens <patrick@netcreators.com>
Tue, 21 Apr 2009 10:27:54 +0000 (10:27 +0000)
committerPatrick Broens <patrick@netcreators.com>
Tue, 21 Apr 2009 10:27:54 +0000 (10:27 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@5339 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/class.filelistfoldertree.php

index cde467e..4887e90 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-21  Patrick Broens  <patrick@patrickbroens.nl>
+
+       * Fixed bug #10939: Wrong nesting of <ul> <li> tags in expanded mount root in module file > filelist
+
 2009-04-21  Francois Suter  <francois@typo3.org>
 
        * Follow up to #10320 (again): t3lib_extMgm::addStaticFile() call did not reflect changes in location of static templates in css_styled_content (from 2009-04-20)
index dde8151..0529716 100644 (file)
@@ -298,6 +298,7 @@ class filelistFolderTree extends t3lib_folderTree {
 
                        // Traverse mounts:
                foreach($this->MOUNTS as $key => $val)  {
+                       $hasSub = false;
                        $specUID = t3lib_div::md5int($val['path']);
                        $this->specUIDmap[$specUID] = $val['path'];
 
@@ -333,8 +334,12 @@ class filelistFolderTree extends t3lib_folderTree {
                        $row['path']  = $val['path'];
                        $row['title'] = $val['name'];
 
+                               // hasSub is true when the root of the mount is expanded
+                       if ($isOpen) {
+                               $hasSub = true;
+                       }
                                // Add the root of the mount to ->tree
-                       $this->tree[] = array('HTML' => $firstHtml, 'row' => $row, 'bank' => $this->bank);
+                       $this->tree[] = array('HTML' => $firstHtml, 'row' => $row, 'bank' => $this->bank, 'hasSub' => $hasSub);
 
                                // If the mount is expanded, go down:
                        if ($isOpen)
@@ -409,7 +414,7 @@ class filelistFolderTree extends t3lib_folderTree {
                                $icon = 'gfx/i/_icon_' .$webpath . 'folders' . ($type == 'readonly' ? '_ro' : '') . '.gif';
                                if ($val == '_temp_')   {
                                        $icon = 'gfx/i/sysf.gif';
-                                       $row['title'] = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:temp', true); 
+                                       $row['title'] = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:temp', true);
                                        $row['_title'] = '<strong>' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_file_list.xml:temp', true) . '</strong>';
                                }
                                if ($val == '_recycler_')       {