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

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

18
classes/module/Module.php
View File

@@ -1307,6 +1307,14 @@ abstract class ModuleCore
{
return true;
}
public static function getPaypalIgnore()
{
$iso_code = Country::getIsoById((int)Configuration::get('PS_COUNTRY_DEFAULT'));
$paypal_countries = array('ES', 'FR', 'PL', 'IT');
if (Context::getContext()->getMobileDevice() && Context::getContext()->shop->getTheme() == 'default' && in_array($iso_code, $paypal_countries))
return 'm.`name` = \'paypal\'';
}
/**
* Returns the list of the payment module associated to the current customer
@@ -1335,14 +1343,10 @@ abstract class ModuleCore
if (Db::getInstance()->getValue('SELECT `id_hook` FROM `'._DB_PREFIX_.'hook` WHERE `name` = \'displayPayment\''))
$hookPayment = 'displayPayment';
$paypal_condition = '';
$iso_code = Country::getIsoById((int)Configuration::get('PS_COUNTRY_DEFAULT'));
$paypal_countries = array('ES', 'FR', 'PL', 'IT');
if (Context::getContext()->getMobileDevice() && Context::getContext()->shop->getTheme() == 'default' && in_array($iso_code, $paypal_countries))
$paypal_condition = ' AND m.`name` = \'paypal\'';
$list = Shop::getContextListShopID();
if ($paypal_condition = Module::getPaypalIgnore())
$paypal_condition = ' AND '.$paypal_condition;
return Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS('SELECT DISTINCT m.`id_module`, h.`id_hook`, m.`name`, hm.`position`
FROM `'._DB_PREFIX_.'module` m
'.($frontend ? 'LEFT JOIN `'._DB_PREFIX_.'module_country` mc ON (m.`id_module` = mc.`id_module` AND mc.id_shop = '.(int)$context->shop->id.')' : '').'