From 1313632eb1922c06403e0c0f65d14cfaf5d503e9 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Thu, 19 Apr 2012 14:50:14 +0000
Subject: [PATCH] // Fix combination edition

---
 classes/ObjectModel.php | 4 ++--
 classes/Product.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
index 4f8963fec..a5d16f554 100644
--- a/classes/ObjectModel.php
+++ b/classes/ObjectModel.php
@@ -531,8 +531,8 @@ abstract class ObjectModelCore
 			foreach (Shop::getContextListShopID() as $id_shop)
 			{
 				$fields['id_shop'] = $id_shop;
-				$where = 'id_product = '.(int)$this->id.' AND id_shop = '.(int)$id_shop;
-				if (Db::getInstance()->getValue('SELECT id_product FROM '._DB_PREFIX_.$this->def['table'].'_shop WHERE '.$where))
+				$where = $this->def['primary'].' = '.(int)$this->id.' AND id_shop = '.(int)$id_shop;
+				if (Db::getInstance()->getValue('SELECT '.$this->def['primary'].' FROM '._DB_PREFIX_.$this->def['table'].'_shop WHERE '.$where))
 					$result &= Db::getInstance()->update($this->def['table'].'_shop', $fields, $where, 0, $null_values);
 				else
 					$result &= Db::getInstance()->insert($this->def['table'].'_shop', $fields, $null_values);
diff --git a/classes/Product.php b/classes/Product.php
index 349124ce2..68c0387ed 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -2752,7 +2752,7 @@ class ProductCore extends ObjectModel
 			FROM `'._DB_PREFIX_.'product_attribute` pa
 			'.Shop::addSqlAssociation('product_attribute', 'pa').'
 			WHERE product_attribute_shop.`default_on` = 1
-				AND pa`id_product` = '.(int)$this->id
+				AND pa.`id_product` = '.(int)$this->id
 		);
 		if ($row)
 			return true;