Fixed bug #13095: Massuploader: Max file size is shown in KB (THanks to Steffen Gebert)
authorBenni Mack <benni.mack@typo3.org>
Sun, 3 Jan 2010 14:22:57 +0000 (14:22 +0000)
committerBenni Mack <benni.mack@typo3.org>
Sun, 3 Jan 2010 14:22:57 +0000 (14:22 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@6710 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/js/flashupload.js

index dfbd04a..4014107 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-03  Benjamin Mack  <benni@typo3.org>
+
+       * Fixed bug #13095: Massuploader: Max file size is shown in KB (THanks to Steffen Gebert)
+
 2009-12-30  Xavier Perseguers  <typo3@perseguers.ch>
 
        * Raised DBAL version from 1.0.2 to 1.1.0
index 34af1ed..47815e0 100644 (file)
@@ -232,7 +232,7 @@ Ext.onReady(function() {
                        // add some info to the dialog
                        // you can replace this by adding your own component with this ID in the constructor
                        if (!this.getComponent('t3-upload-window-infopanel')) {
-                               var maxFileSize = (swfConfig.file_size_limit.toString().indexOf('B') > 0 ? swfConfig.file_size_limit : swfConfig.file_size_limit + ' KB');
+                               var maxFileSize = (swfConfig.file_size_limit.toString().indexOf('B') > 0 ? swfConfig.file_size_limit : (swfConfig.file_size_limit / 1024) + ' MB');
                                var txt = String.format(TYPO3.LLL.fileUpload.infoComponentMaxFileSize, maxFileSize) + '<br/>';
                                if (swfConfig.file_upload_limit) {
                                        txt += String.format(TYPO3.LLL.fileUpload.infoComponentFileUploadLimit, swfConfig.file_upload_limit) + '<br/>';