From: Benni Mack <benni.mack@typo3.org>
Date: Thu, 6 May 2010 19:21:25 +0000 (+0000)
Subject: Fixed bug #14315: Filelist: AJAX bug with multiple file mounts in the folder tree
X-Git-Tag: TYPO3_4-4-0beta3~202
X-Git-Url: http://git.typo3.org/Packages/TYPO3.CMS.git/commitdiff_plain/1e1f89756595b3a616081f7cc235ba937120cb76?ds=inline

Fixed bug #14315: Filelist: AJAX bug with multiple file mounts in the folder tree


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

diff --git a/ChangeLog b/ChangeLog
index 1813c114108e..8936e3af6ce8 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2010-05-06  Benjamin Mack  <benni@typo3.org>
 
+	* Fixed bug #14315: Filelist: AJAX bug with multiple file mounts in the folder tree
 	* Fixed bug #12429: Renamed "t3lib_tstemplate::procesIncludes" to "processIncludes" due to a misspelling (Thanks to Bernhard Kraft)
 	* Fixed bug #13996: Hardcoded TYPO3 logo shown in "HELP > About TYPO3" (Thanks to Stephan Kellermayr)
 	* Fixed bug #13995: Hardcoded TYPO3 logo image shown in "HELP > About Modules" (Thanks to Stephan Kellermayr and Steffen Kamper)
diff --git a/typo3/class.filelistfoldertree.php b/typo3/class.filelistfoldertree.php
index 1847791c6d70..542e4bf454b9 100644
--- a/typo3/class.filelistfoldertree.php
+++ b/typo3/class.filelistfoldertree.php
@@ -169,7 +169,7 @@ class filelistFolderTree extends t3lib_folderTree {
 			// if this item is the start of a new level,
 			// then a new level <ul> is needed, but not in ajax mode
 			if($v['isFirst'] && !($doCollapse) && !($doExpand && $expandedFolderUid == $uid))	{
-				$itemHTML = "</div><ul>\n";
+				$itemHTML = "<ul>\n";
 			}
 
 			// add CSS classes to the list item
@@ -179,10 +179,10 @@ class filelistFolderTree extends t3lib_folderTree {
 			$itemHTML .='
 				<li id="'.$idAttr.'"'.($classAttr ? ' class="'.$classAttr.'"' : '').'><div class="treeLinkItem">'.
 					$v['HTML'].
-					$this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$v['bank']);
+					$this->wrapTitle($this->getTitleStr($v['row'],$titleLen),$v['row'],$v['bank']) . '</div>';
 
 
-			if(!$v['hasSub']) { $itemHTML .= "</div></li>\n"; }
+			if(!$v['hasSub']) { $itemHTML .= "</li>\n"; }
 
 			// we have to remember if this is the last one
 			// on level X so the last child on level X+1 closes the <ul>-tag
@@ -342,6 +342,12 @@ class filelistFolderTree extends t3lib_folderTree {
 
 				// Add tree:
 			$treeArr = array_merge($treeArr, $this->tree);
+			
+				// if this is an AJAX call, don't run through all mounts, only 
+				// show the expansion of the current one, not the rest of the mounts
+			if (TYPO3_REQUESTTYPE & TYPO3_REQUESTTYPE_AJAX) {
+				break;
+			}
 		}
 		return $this->printTree($treeArr);
 	}