using memory_get_usage due to some people not having php 5.2

diff --git a/actions/upload.php b/actions/upload.php
index b74f72c7b2eae6fc5d02586d796266b5b4086c0d..6911978b052807436febaf0f411b2fab06a799b3 100644 (file)
--- a/actions/upload.php
+++ b/actions/upload.php
@@ -116,7 +116,10 @@
                $mem_avail = $mem_avail * 1024 * 1024;\r
                if ($image_lib == 'GD') {\r
                        $mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]);\r
-                       $mem_avail = $mem_avail - memory_get_peak_usage() - 2097152; // 2 MB buffer\r
+                       \r
+                       $mem_used = memory_get_usage();\r
+                               \r
+                       $mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer\r
                        if ($mem_required > $mem_avail) {\r
                                array_push($not_uploaded, $sent_file['name']);\r
                                array_push($error_msgs, elgg_echo('tidypics:image_pixels'));\r