From 094e99901319f923a900330280fd127603c91635 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Wed, 25 Feb 2009 13:33:53 +0000 Subject: [PATCH] - Patch #383318 by mr.baileys: incorrect memory shortage warning when memory limit is unlimited. --- modules/system/system.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/system/system.install b/modules/system/system.install index ecf2e9a493b..c244684e9da 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -65,10 +65,10 @@ function system_requirements($phase) { $memory_limit = ini_get('memory_limit'); $requirements['php_memory_limit'] = array( 'title' => $t('PHP memory limit'), - 'value' => $memory_limit, + 'value' => $memory_limit == -1 ? t('-1 (Unlimited)') : $memory_limit, ); - if ($memory_limit && parse_size($memory_limit) < parse_size(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)) { + if ($memory_limit && $memory_limit != -1 && parse_size($memory_limit) < parse_size(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)) { $description = ''; if ($phase == 'install') { $description = $t('Consider increasing your PHP memory limit to %memory_minimum_limit to help prevent errors in the installation process.', array('%memory_minimum_limit' => DRUPAL_MINIMUM_PHP_MEMORY_LIMIT));