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

// fixed little bug on Module class

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12541 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2012-01-18 16:46:45 +00:00
parent 2600c7c0a9
commit e01d1de346
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Module.php
View File

@@ -788,7 +788,7 @@ abstract class ModuleCore
if (Tools::file_exists_cache(_PS_MODULE_DIR_.$moduleName.'/'.$moduleName.'.php'))
{
include_once(_PS_MODULE_DIR_.$moduleName.'/'.$moduleName.'.php');
if (class_exists($moduleName, false))
return self::$_INSTANCE[$moduleName] = new $moduleName;
}
@@ -850,7 +850,7 @@ abstract class ModuleCore
foreach ($modules_dir as $module)
{
// Memory usage checking
if (function_exists('memory_get_usage') && $memory_limit !== -1)
if (function_exists('memory_get_usage') && $memory_limit != '-1')
{
$current_memory = memory_get_usage(true);
// memory_threshold in MB