// merge 1.4 (5397)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 16:00:58 +00:00
parent 7b4eda5137
commit 43b6a41bbc
126 changed files with 3390 additions and 1430 deletions
@@ -539,6 +539,7 @@ abstract class ModuleCore
 		*/
 	public static function getNonNativeModuleList()
 	{
+		$db = Db::getInstance();
 		$modulesDirOnDisk = Module::getModulesDirOnDisk();

 		$module_list_xml = _PS_ROOT_DIR_.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'modules_list.xml';
@@ -552,7 +553,7 @@ abstract class ModuleCore
 					$arrNativeModules[] = '"'.pSQL($module['name']).'"';
 			}

-		return Db::getInstance()->ExecuteS('
+		return $db->ExecuteS('
 			SELECT *
 			FROM `'._DB_PREFIX_.'module` m
 			WHERE name NOT IN ('.implode(',',$arrNativeModules).') ');