From 0abe3b31939039696bd0c056941db8f7fa89422d Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Tue, 21 May 2013 13:03:41 +0300 Subject: [PATCH 1/2] [*] Class: Module / Use method instead of SQL query --- classes/module/Module.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/module/Module.php b/classes/module/Module.php index 2877c1bad..080ae4865 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -215,7 +215,7 @@ abstract class ModuleCore } // Check if module is installed - $result = Db::getInstance()->getRow('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($this->name).'\''); + $result = Module::isInstalled($this->name); if ($result) { $this->_errors[] = $this->l('This module has already been installed.'); From 446abf7e3f7fc4bda5994b563100942d3a94cab6 Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Tue, 21 May 2013 13:11:41 +0200 Subject: [PATCH 2/2] // use getModuleIdByName() --- classes/module/Module.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/module/Module.php b/classes/module/Module.php index 080ae4865..fb70d9075 100644 --- a/classes/module/Module.php +++ b/classes/module/Module.php @@ -1543,7 +1543,7 @@ abstract class ModuleCore { if (!Cache::isStored('Module::isInstalled'.$module_name)) { - $id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($module_name).'\''); + $id_module = Module::getModuleIdByName($module_name); Cache::store('Module::isInstalled'.$module_name, (bool)$id_module); } return Cache::retrieve('Module::isInstalled'.$module_name); @@ -1554,7 +1554,7 @@ abstract class ModuleCore if (!Cache::isStored('Module::isEnabled'.$module_name)) { $active = false; - $id_module = Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module` WHERE `name` = \''.pSQL($module_name).'\''); + $id_module = Module::getModuleIdByName($module_name); if (Db::getInstance()->getValue('SELECT `id_module` FROM `'._DB_PREFIX_.'module_shop` WHERE `id_module` = '.(int)$id_module.' AND `id_shop` = '.(int)Context::getContext()->shop->id)) $active = true; Cache::store('Module::isEnabled'.$module_name, (bool)$active);