From 6c61d6c3209324f6603fb23d751eebb61422a135 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 29 Apr 2009 10:18:34 +0000 Subject: [PATCH] bug #2780722 [import] Incorrect maximum file size --- ChangeLog | 1 + libraries/common.lib.php | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 202189a0c..49ccdbcd1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA 3.1.5.0 (not yet released) - patch #2739001 [export] XML does not allow spaces in element names, thanks to Derek Schaefer - drummingds1 +- bug #2780722 [import] Incorrect maximum file size 3.1.4.0 (2009-04-25) + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 262d48fd1..b94d9e5cb 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -140,7 +140,9 @@ function PMA_getIcon($icon, $alternate = '', $container = false, $force_text = f */ function PMA_displayMaximumUploadSize($max_upload_size) { - list($max_size, $max_unit) = PMA_formatByteDown($max_upload_size); + // I have to reduce the second parameter (sensitiveness) from 6 to 4 + // to avoid weird results like 512 kKib + list($max_size, $max_unit) = PMA_formatByteDown($max_upload_size, 4); return '(' . sprintf($GLOBALS['strMaximumSize'], $max_size, $max_unit) . ')'; }