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

Merge pull request #444 from PrestaEdit/patch-38

Browse Source 
[*] Class: Module / Use method instead of SQL query
This commit is contained in:
Vincent Augagneur committed 2013-05-23 05:21:11 -07:00
2 parents affca31558 446abf7e3f
commit dd363be433
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
classes/module/Module.php
+3 -3
View File
@@ -215,7 +215,7 @@ abstract class ModuleCore
} }
// Check if module is installed // 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) if ($result)
{ {
$this->_errors[] = $this->l('This module has already been installed.'); $this->_errors[] = $this->l('This module has already been installed.');
@@ -1543,7 +1543,7 @@ abstract class ModuleCore
{ {
if (!Cache::isStored('Module::isInstalled'.$module_name)) 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); Cache::store('Module::isInstalled'.$module_name, (bool)$id_module);
} }
return Cache::retrieve('Module::isInstalled'.$module_name); return Cache::retrieve('Module::isInstalled'.$module_name);
@@ -1554,7 +1554,7 @@ abstract class ModuleCore
if (!Cache::isStored('Module::isEnabled'.$module_name)) if (!Cache::isStored('Module::isEnabled'.$module_name))
{ {
$active = false; $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)) 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; $active = true;
Cache::store('Module::isEnabled'.$module_name, (bool)$active); Cache::store('Module::isEnabled'.$module_name, (bool)$active);