From cedddcd1c5589798f8a8c687929f9efa3127a3f4 Mon Sep 17 00:00:00 2001
From: shish <shish@7f39781d-f577-437e-ae19-be835c7a54ca>
Date: Thu, 5 Jul 2007 20:16:10 +0000
Subject: [PATCH] make get_memory_limit use the global rather than the GD limit

git-svn-id: file:///home/shish/svn/shimmie2/trunk@223 7f39781d-f577-437e-ae19-be835c7a54ca
---
 core/util.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/util.inc.php b/core/util.inc.php
index 9e1a641f..29a7c2c6 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -157,7 +157,7 @@ function get_memory_limit() {
 
 	// thumbnail generation requires lots of memory
 	$default_limit = 8*1024*1024;
-	$shimmie_limit = parse_shorthand_int($config->get_int("thumb_gd_mem_limit"));
+	$shimmie_limit = parse_shorthand_int($config->get_int("thumb_mem_limit"));
 	if($shimmie_limit < 3*1024*1024) {
 		// we aren't going to fit, override
 		$shimmie_limit = $default_limit;