// correcting merge problem

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10409 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vChabot committed 2011-11-22 13:07:47 +00:00
1 parent e095ebccd3
commit 9fef06a9bb
1 file changed
+3 -3
+3 -3
View File
@@ -112,12 +112,12 @@ class GroupCore extends ObjectModel
public static function getReduction($id_customer = null) public static function getReduction($id_customer = null)
{ {
if (!isset(self::$_cacheReduction['customer'][(int)$id_customer])) if (!isset(self::$cache_reduction['customer'][(int)$id_customer]))
{ {
$id_group = $id_customer ? Customer::getDefaultGroupId((int)$id_customer) : (int)Configuration::get('PS_CUSTOMER_GROUP'); $id_group = $id_customer ? Customer::getDefaultGroupId((int)$id_customer) : (int)Configuration::get('PS_CUSTOMER_GROUP');
self::$_cacheReduction['customer'][(int)$id_customer] = Group::getReductionByIdGroup($id_group); self::$cache_reduction['customer'][(int)$id_customer] = Group::getReductionByIdGroup($id_group);
} }
return self::$_cacheReduction['customer'][(int)$id_customer]; return self::$cache_reduction['customer'][(int)$id_customer];
} }
public static function getReductionByIdGroup($id_group) public static function getReductionByIdGroup($id_group)