// Replace shop->addSqlAssociation() by static call

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13620 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-02-27 13:07:51 +00:00
parent c2cef61a5a
commit 4ee2698992
23 changed files with 55 additions and 75 deletions
+2 -5
View File
@@ -195,14 +195,11 @@ class CurrencyCore extends ObjectModel
*
* @return array Currencies
*/
public static function getCurrencies($object = false, $active = 1, Shop $shop = null)
public static function getCurrencies($object = false, $active = 1)
{
if (!$shop)
$shop = Context::getContext()->shop;
$sql = 'SELECT *
FROM `'._DB_PREFIX_.'currency` c
'.$shop->addSqlAssociation('currency', 'c').'
'.Shop::addSqlAssociation('currency', 'c').'
WHERE `deleted` = 0'
.($active == 1 ? ' AND c.`active` = 1' : '').'
GROUP BY c.id_currency