Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

This commit is contained in:
Rémi Gaillard
2013-02-01 18:36:48 +01:00
14 changed files with 45 additions and 37 deletions
+8 -2
View File
@@ -119,14 +119,20 @@ class CartRuleCore extends ObjectModel
/**
* @see ObjectModel::add()
*/
public function add($autodate = true, $nullValues = false)
public function add($autodate = true, $null_values = false)
{
if (!parent::add($autodate, $nullValues))
if (!parent::add($autodate, $null_values))
return false;
Configuration::updateGlobalValue('PS_CART_RULE_FEATURE_ACTIVE', '1');
return true;
}
public function update($null_values = false)
{
Cache::clean('getContextualValue_'.$this->id.'_*');
return parent::update($null_values);
}
/**
* @see ObjectModel::delete()