Fixed bug #16130: buggy initialization of flash uploader when only certain file exten...

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

diff --git a/ChangeLog b/ChangeLog
index 4daf46f..6c3a621 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 2010-11-05  Steffen Gebert  <steffen@steffen-gebert.de>
 
        * Added feature #16258: Add Khmer language to TYPO3 core (Thanks to Keo Visay)
+       * Fixed bug #16130: buggy initialization of flash uploader when only certain file extensions are allowed (Thanks to Andreas Kiessling)
 
 2010-11-04  Stanislas Rolland  <typo3@sjbr.ca>
 

diff --git a/typo3/js/flashupload.js b/typo3/js/flashupload.js
index 83e7a22..cbb0208 100644 (file)
--- a/typo3/js/flashupload.js
+++ b/typo3/js/flashupload.js
@@ -282,6 +282,7 @@ Ext.onReady(function() {
                        swfConfig.post_params.vC         = top.TS.veriCode;
                        swfConfig.file_types_description = Ext.value(this.uploadFileTypesDescription, this.swfDefaultConfig.file_types_description);
                        this.setFileTypeRestrictions(this.uploadFileTypes);
+                       swfConfig.file_types = this.swfDefaultConfig.file_types;
                        return swfConfig;
                },
                
@@ -291,7 +292,7 @@ Ext.onReady(function() {
                 */
                setFileTypeRestrictions: function(typo3FileTypes) {
                        if (typo3FileTypes.allow && typo3FileTypes.allow !== '' && typo3FileTypes.allow !== '*') {
-                               var allowedFiles = TYPO3.helpers.split(typo3FileTypes.allow, ',');
+                               var allowedFiles = typo3FileTypes.allow.split(',');
                                this.swfDefaultConfig.file_types = '*.' + allowedFiles.join(';*.');
                        }
                        if (typo3FileTypes.deny && typo3FileTypes.deny !== '') {