diff options
| author | Dries Buytaert <dries@buytaert.net> | 2009-02-25 13:33:53 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2009-02-25 13:33:53 +0000 |
| commit | 094e99901319f923a900330280fd127603c91635 (patch) | |
| tree | b549a7e5d2d4156d7d7e7babb142156a5d648500 | |
| parent | 743c8adcf7855c89eeb457c7828b4d0a6debd266 (diff) | |
| download | brdo-094e99901319f923a900330280fd127603c91635.tar.gz brdo-094e99901319f923a900330280fd127603c91635.tar.bz2 | |
- Patch #383318 by mr.baileys: incorrect memory shortage warning when memory limit is unlimited.
| -rw-r--r-- | modules/system/system.install | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/system/system.install b/modules/system/system.install index ecf2e9a49..c244684e9 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)); |