* Fixed bug #4643: File Upload did not recognize BE-User option "defaultFileUp...
authorMichael Stucki <michael.stucki@typo3.org>
Tue, 23 Jan 2007 16:44:41 +0000 (16:44 +0000)
committerMichael Stucki <michael.stucki@typo3.org>
Tue, 23 Jan 2007 16:44:41 +0000 (16:44 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@1927 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/file_upload.php

index 2e968ce..6a58a2c 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,8 @@
 
        * Slightly changed the check for IE browsers in t3lib_div::clientInfo()
        * !!! Removed function "netPrintApplication_offsiteLinkWrap" and TypoScript property "netprintApplicationLink" for IMGTEXT elements which were only used by one extension which is obsolete meanwhile...
-       * Fixed bug #4830: Right click in CM did not work anymore
+       * Fixed bug #4830: Right click in CM did not work anymore (thanks to Benjamin Mack)
+       * Fixed bug #4643: File Upload did not recognize BE-User option "defaultFileUploads" (thanks to Benjamin Mack)
 
 2007-01-20  Michael Stucki  <michael@typo3.org>
 
index c6276b7..45652f6 100755 (executable)
@@ -108,8 +108,11 @@ class SC_file_upload {
                $this->target = t3lib_div::_GP('target');
                $this->returnUrl = t3lib_div::_GP('returnUrl');
 
-               if (empty($this->number) && $GLOBALS['BE_USER']->getTSConfig('options.defaultFileUploads'))     {
-                       $this->number = t3lib_div::intInRange($GLOBALS['BE_USER']->getTSConfig('options.defaultFileUploads'),1,$this->uploadNumber);
+               if (empty($this->number))       {
+                       $defaultFileUploads = $GLOBALS['BE_USER']->getTSConfigVal('options.defaultFileUploads');
+                       if ($defaultFileUploads)        {
+                               $this->number = t3lib_div::intInRange($defaultFileUploads,1,$this->uploadNumber);
+                       }
                }
                        // Init basic-file-functions object:
                $this->basicff = t3lib_div::makeInstance('t3lib_basicFileFunctions');