From e01d1de346ec45d9bf66aa61153b87f8ba0b80db Mon Sep 17 00:00:00 2001 From: aFolletete Date: Wed, 18 Jan 2012 16:46:45 +0000 Subject: [PATCH] // fixed little bug on Module class git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12541 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/Module.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/Module.php b/classes/Module.php index 4c7ef3e50..4c2c0cd66 100644 --- a/classes/Module.php +++ b/classes/Module.php @@ -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