// Merge -> revision 8114

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8115 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-19 09:46:12 +00:00
parent 14a8c84bdd
commit a1843c1900
12 changed files with 50 additions and 19 deletions

View File

@@ -574,6 +574,26 @@ abstract class ModuleCore
$modules_dir = self::getModulesDirOnDisk();
foreach ($modules_dir AS $module)
{
// Memory usage checking
if ($memory_limit = strtoupper(@ini_get('memory_limit')))
{
if (strpos($memory_limit, 'M'))
{
$memory_limit = str_replace('M', '', $memory_limit);
$memory_limit *= 1024 * 1024;
}
elseif (strpos($memory_limit, 'K'))
{
$memory_limit = str_replace('K', '', $memory_limit);
$memory_limit *= 1024;
}
if ($memory_limit - memory_get_usage() <= (512 * 1024))
{
$errors[] = Tools::displayError('All modules cannot be loaded due to memory limit restriction reason, please increase your memory_limit value on your server configuration');
break;
}
}
$configFile = _PS_MODULE_DIR_.$module.'/config.xml';
$xml_exist = file_exists($configFile);
if ($xml_exist)