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
This commit is contained in:
shish 2007-07-05 20:16:10 +00:00
parent 1ecb6b688c
commit cedddcd1c5

View file

@ -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;