From 2a0b13d8668da50325dac33b21de1a376af28953 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Fri, 17 Jul 2009 01:00:19 +0000 Subject: using memory_get_usage due to some people not having php 5.2 --- actions/upload.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'actions') diff --git a/actions/upload.php b/actions/upload.php index b74f72c7b..6911978b0 100644 --- a/actions/upload.php +++ b/actions/upload.php @@ -116,7 +116,10 @@ $mem_avail = $mem_avail * 1024 * 1024; if ($image_lib == 'GD') { $mem_required = ceil(5.35 * $imginfo[0] * $imginfo[1]); - $mem_avail = $mem_avail - memory_get_peak_usage() - 2097152; // 2 MB buffer + + $mem_used = memory_get_usage(); + + $mem_avail = $mem_avail - $mem_used - 2097152; // 2 MB buffer if ($mem_required > $mem_avail) { array_push($not_uploaded, $sent_file['name']); array_push($error_msgs, elgg_echo('tidypics:image_pixels')); -- cgit v1.2.3