From 00e32cc0994911c004757f32005e16d8e51ee9e0 Mon Sep 17 00:00:00 2001
From: Francois Gaillard <francois.gaillard@prestashop.com>
Date: Tue, 3 Jan 2012 09:31:19 +0000
Subject: [PATCH] [-] Classes : #PSCFI-4569 : BugFix : Get module instance by
 name fixed

---
 classes/Module.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/classes/Module.php b/classes/Module.php
index ae0244542..99d246160 100644
--- a/classes/Module.php
+++ b/classes/Module.php
@@ -783,14 +783,17 @@ abstract class ModuleCore
 	  */
 	public static function getInstanceByName($moduleName)
 	{
-		if (!Tools::file_exists_cache(_PS_MODULE_DIR_.$moduleName.'/'.$moduleName.'.php'))
-			return false;
-		include_once(_PS_MODULE_DIR_.$moduleName.'/'.$moduleName.'.php');
-		if (!class_exists($moduleName, false))
-			return false;
-
 		if (!isset(self::$_INSTANCE[$moduleName]))
-			self::$_INSTANCE[$moduleName] = new $moduleName;
+		{
+			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;
+			}
+			return false;
+		}
 		return self::$_INSTANCE[$moduleName];
 	}