[-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760

This commit is contained in:
Rémi Gaillard
2013-02-11 11:45:42 +01:00
parent ba11328cec
commit 7ed1a548a2
2 changed files with 12 additions and 14 deletions
+1 -7
View File
@@ -286,6 +286,7 @@ class HookCore extends ObjectModel
{
$sql->leftJoin('module_group', 'mg', 'mg.`id_module` = m.`id_module`');
$sql->where('mg.`id_group` IN ('.implode(', ', $groups).')');
$sql->where(Module::getPaypalIgnore());
$sql->groupBy('hm.id_hook, hm.id_module');
}
@@ -298,16 +299,9 @@ class HookCore extends ObjectModel
// Get all available payment module
$payment_modules = array();
if (isset($context->shop->id))
foreach (Module::getPaymentModules() as $module)
$payment_modules[] = $module['name'];
if ($results)
foreach ($results as $row)
{
if ($row['hook'] == 'displayPayment' && !in_array($row['module'], $payment_modules))
continue;
$row['hook'] = strtolower($row['hook']);
if (!isset($list[$row['hook']]))
$list[$row['hook']] = array();