From 5a922391e29bf54b0470329fd481cf2cabcb54e4 Mon Sep 17 00:00:00 2001 From: gRoussac Date: Thu, 2 May 2013 19:02:48 +0200 Subject: [PATCH] [-] INSTALLER : Fix bug #PSCFV-8605 first part, do not affect memeory limit when upgrading if set to -1 --- install-dev/upgrade/upgrade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-dev/upgrade/upgrade.php b/install-dev/upgrade/upgrade.php index 81b0481a8..b51c04d4e 100644 --- a/install-dev/upgrade/upgrade.php +++ b/install-dev/upgrade/upgrade.php @@ -34,8 +34,8 @@ $engineType = 'ENGINE_TYPE'; // setting the memory limit to 128M only if current is lower $memory_limit = ini_get('memory_limit'); if (substr($memory_limit,-1) != 'G' - AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0,-1) < 128) - OR is_numeric($memory_limit) AND (intval($memory_limit) < 131072)) + AND ((substr($memory_limit,-1) == 'M' AND substr($memory_limit,0, -1) < 128) + OR is_numeric($memory_limit) AND (intval($memory_limit) < 131072) AND $memory_limit > 0) ) @ini_set('memory_limit','128M');