// merge 1.4 => 6117

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 09:09:38 +00:00
parent e60a8b9203
commit 56099fa735
29 changed files with 199 additions and 217 deletions
@@ -146,6 +146,7 @@ class FeatureValueCore extends ObjectModel
 		LEFT JOIN '._DB_PREFIX_.'feature_value_lang fvl ON (fvl.`id_feature_value` = fv.`id_feature_value`)
 		WHERE `value` = \''.pSQL($name).'\'
 		AND fv.`id_feature` = '.(int)$id_feature.'
+		AND fv.`custom` = 0
 		GROUP BY fv.`id_feature_value` LIMIT 1');

 		if (!isset($rq[0]['id_feature_value']) OR !$id_feature_value = (int)$rq[0]['id_feature_value'])