dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Merge -> revision 9288

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-10-12 16:04:28 +00:00
parent 17aa43a4e5
commit 798de9aaea
32 changed files with 1529 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/model.php
+4 -4
View File
@@ -48,8 +48,8 @@ if (file_exists(INSTALL_PATH.'/../config/settings.inc.php'))
// 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)
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))
){
@ini_set('memory_limit','128M');
@@ -108,9 +108,9 @@ if (isset($_GET['method']))
case 'doUpgrade' :
require_once('xml/doUpgrade.php');
break;
case 'getVersionFromDb' :
require_once('xml/getVersionFromDb.php');
break;
}
}
}