Index: typo3/class.browse_links.php
===================================================================
--- typo3/class.browse_links.php	(revision 3851)
+++ typo3/class.browse_links.php	(working copy)
@@ -2640,8 +2640,15 @@
 	 */
 	function uploadForm($path)	{
 		global $BACK_PATH;
-		$count=3;
-
+			
+			// Read configuration of upload field count
+		$count = $GLOBALS['BE_USER']->getTSConfigVal('options.fileTree.uploadFieldsInLinkBrowser');
+		if ($count === '0') {
+			return '';
+		}
+		$count = intval($count) == 0 ? 3 : intval($count);
+		
+		
 			// Create header, showing upload path:
 		$header = t3lib_div::isFirstPartOfStr($path,PATH_site)?substr($path,strlen(PATH_site)):$path;
 		$code=$this->barheader($GLOBALS['LANG']->getLL('uploadImage').':');
@@ -2694,6 +2701,11 @@
 	 */
 	function createFolder($path)	{
 		global $BACK_PATH;
+		
+			// Don't show Folder-create form if it's denied
+		if ($GLOBALS['BE_USER']->getTSConfigVal('options.fileTree.denyCreateFolder') == 1) {
+			return '';
+		}
 			// Create header, showing upload path:
 		$header = t3lib_div::isFirstPartOfStr($path,PATH_site)?substr($path,strlen(PATH_site)):$path;
 		$code=$this->barheader($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:file_newfolder.php.pagetitle').':');