Really fix it.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@4879 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index 15061e31b87e4f60fff4c7e74d50da0603d4b440..6398a10b67a05f1ea938f2a58de4618f781bac25 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,7 +19,7 @@ Version 1.5.0 -- CVS
     (#725443, #722823, #729225)
   - Fix for bad attachment view link (#697381, #729295)
   - Fix comp_in_new in search and addressbook not having right parameters (#731768).
-
+  - Fix max attachment filesize off by factor 10 when ini_var set in bytes (#730742).
 
 **************************************
 *** SquirrelMail Stable Series 1.4 ***

diff --git a/src/compose.php b/src/compose.php
index 35d370d4ce4986ddd07d1c486c816f7fac101edb..22020d954ccef2c50790cd8d831cb74c3afb12ea 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1285,7 +1285,9 @@ function ClearAttachments($composeMessage) {
 /* parse values like 8M and 2k into bytes */
 function getByteSize($ini_size) {
 
-    if(!$ini_size) return FALSE;
+    if(!$ini_size) {
+        return FALSE;
+    }
 
     $ini_size = trim($ini_size);
 
@@ -1304,12 +1306,10 @@ function getByteSize($ini_size) {
                break;
         }
 
-        $bytesize *= (int)substr($ini_size, 0, -1);
+        return ($bytesize * (int)substr($ini_size, 0, -1));
     }
         
-
-
-    return $bytesize;
+    return $ini_size;
 }