// Normalize

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12658 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-24 17:30:33 +00:00
parent 9522086acc
commit 1c0f430600
22 changed files with 288 additions and 294 deletions
+3 -5
View File
@@ -90,18 +90,16 @@ class CombinationCore extends ObjectModel
public function delete()
{
if (!parent::delete() OR $this->deleteAssociations() === false)
if (!parent::delete() || $this->deleteAssociations() === false)
return false;
return true;
}
public function deleteAssociations()
{
if (
Db::getInstance()->execute('
if (Db::getInstance()->execute('
DELETE FROM `'._DB_PREFIX_.'product_attribute_combination`
WHERE `id_product_attribute` = '.(int)($this->id)) === false
)
WHERE `id_product_attribute` = '.(int)$this->id) === false)
return false;
return true;
}