summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/system/system.install4
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));