summaryrefslogtreecommitdiff
path: root/modules/system
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2013-08-05 23:58:15 -0400
committerDavid Rothstein <drothstein@gmail.com>2013-08-05 23:58:15 -0400
commit19e65b966c79e7061827ef5f21ac67cd1159806c (patch)
treef5715889843ee7c991ff70083f31b2a55a0a2656 /modules/system
parentebe236b0c03750c624cd00db96fc535077e6f890 (diff)
downloadbrdo-19e65b966c79e7061827ef5f21ac67cd1159806c.tar.gz
brdo-19e65b966c79e7061827ef5f21ac67cd1159806c.tar.bz2
Issue #1453984 by xjm, naxoc, Dave Reid, underq, dags, tim.plunkett, Heine: Fixed Color module doesn't test for unlimited memory.
Diffstat (limited to 'modules/system')
-rw-r--r--modules/system/system.install2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/system/system.install b/modules/system/system.install
index cf9a5d26c..a58e855ad 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -208,7 +208,7 @@ function system_requirements($phase) {
'value' => $memory_limit == -1 ? t('-1 (Unlimited)') : $memory_limit,
);
- if ($memory_limit && $memory_limit != -1 && parse_size($memory_limit) < parse_size(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT)) {
+ if (!drupal_check_memory_limit(DRUPAL_MINIMUM_PHP_MEMORY_LIMIT, $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));