From 3fcf166a9da7f893aaeceaa3fc888f5ef845895c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= Date: Wed, 21 Aug 2013 18:24:10 +0200 Subject: [PATCH] // small fix --- classes/AttributeGroup.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/classes/AttributeGroup.php b/classes/AttributeGroup.php index 17f12cadf..55ab9b459 100644 --- a/classes/AttributeGroup.php +++ b/classes/AttributeGroup.php @@ -142,14 +142,15 @@ class AttributeGroupCore extends ObjectModel if (!AttributeGroup::cleanDeadCombinations()) return false; /* Also delete related attributes */ - if (Db::getInstance()->execute(' + if (count($to_remove)) + if (!Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'attribute_lang` - WHERE `id_attribute` IN ('.implode(',', $to_remove).')') === false || - Db::getInstance()->execute(' + WHERE `id_attribute` IN ('.implode(',', $to_remove).')') || + !Db::getInstance()->execute(' DELETE FROM `'._DB_PREFIX_.'attribute_shop` - WHERE `id_attribute` IN ('.implode(',', $to_remove).')') === false || - Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id) === false) - return false; + WHERE `id_attribute` IN ('.implode(',', $to_remove).')') || + !Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'attribute` WHERE `id_attribute_group` = '.(int)$this->id)) + return false; $this->cleanPositions(); } $return = parent::delete();