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

// Perf

Browse Source
This commit is contained in:
dMetzger
2012-08-27 09:14:01 +00:00
parent 02c7e495a5
commit bbf911f033
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Hook.php
+11 -8
View File
@@ -242,7 +242,7 @@ class HookCore extends ObjectModel
{ {
$context = Context::getContext(); $context = Context::getContext();
$cache_id = 'hook_module_exec_list'.((isset($context->customer)) ? '_'.$context->customer->id : ''); $cache_id = 'hook_module_exec_list'.((isset($context->customer)) ? '_'.$context->customer->id : '');
if (!Cache::isStored($cache_id)) if (!Cache::isStored($cache_id) || $hook_name == 'displayPayment')
{ {
$frontend = true; $frontend = true;
$groups = array(); $groups = array();
@@ -266,9 +266,11 @@ class HookCore extends ObjectModel
$sql->innerJoin('hook_module', 'hm', 'hm.`id_module` = m.`id_module`'); $sql->innerJoin('hook_module', 'hm', 'hm.`id_module` = m.`id_module`');
$sql->innerJoin('hook', 'h', 'hm.`id_hook` = h.`id_hook`'); $sql->innerJoin('hook', 'h', 'hm.`id_hook` = h.`id_hook`');
$sql->where('(SELECT COUNT(*) FROM '._DB_PREFIX_.'module_shop ms WHERE ms.id_module = m.id_module AND ms.id_shop IN ('.implode(', ', $shop_list).')) = '.count($shop_list)); $sql->where('(SELECT COUNT(*) FROM '._DB_PREFIX_.'module_shop ms WHERE ms.id_module = m.id_module AND ms.id_shop IN ('.implode(', ', $shop_list).')) = '.count($shop_list));
if ($hook_name != 'displayPayment')
$sql->where('h.name != "displayPayment"');
// For payment modules, we check that they are available in the contextual country // For payment modules, we check that they are available in the contextual country
if ($frontend && Validate::isLoadedObject($context->country)) elseif ($frontend && Validate::isLoadedObject($context->country))
$sql->where('(h.name != "displayPayment" OR (SELECT id_country FROM '._DB_PREFIX_.'module_country mc WHERE mc.id_module = m.id_module AND id_country = '.(int)$context->country->id.' LIMIT 1) = '.(int)$context->country->id.')'); $sql->where('(h.name = "displayPayment" AND (SELECT id_country FROM '._DB_PREFIX_.'module_country mc WHERE mc.id_module = m.id_module AND id_country = '.(int)$context->country->id.' LIMIT 1) = '.(int)$context->country->id.')');
if (Validate::isLoadedObject($context->shop)) if (Validate::isLoadedObject($context->shop))
$sql->where('hm.id_shop = '.(int)$context->shop->id); $sql->where('hm.id_shop = '.(int)$context->shop->id);
@@ -309,11 +311,12 @@ class HookCore extends ObjectModel
'live_edit' => $row['live_edit'], 'live_edit' => $row['live_edit'],
); );
} }
if ($hook_name != 'displayPayment')
Cache::store($cache_id, $list); {
Cache::store($cache_id, $list);
// @todo remove this in 1.6, we keep it in 1.5 for retrocompatibility // @todo remove this in 1.6, we keep it in 1.5 for retrocompatibility
self::$_hook_modules_cache_exec = $list; self::$_hook_modules_cache_exec = $list;
}
} }
else else
$list = Cache::retrieve($cache_id); $list = Cache::retrieve($cache_id);