// FIxed #PSFV-752

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14411 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-02 14:43:52 +00:00
parent cb3056831e
commit 8cb35dc9b1
2 changed files with 75 additions and 59 deletions
@@ -44,7 +44,7 @@ class CombinationCore extends ObjectModel
 	public $price;

 	public $ecotax;
-	
+
 	public $minimal_quantity = 1;

 	public $quantity;
@@ -207,8 +207,18 @@ class CombinationCore extends ObjectModel
 		return parent::isCurrentlyUsed('product_attribute');
 	}

+	/**
+	 * For a given product_attribute reference, returns the corresponding id
+	 *
+	 * @param int $id_product
+	 * @param string $reference
+	 * @return int id
+	 */
 	public static function getIdByReference($id_product, $reference)
 	{
+		if (empty($reference))
+			return 0;
+
 		$query = new DbQuery();
 		$query->select('pa.id_product_attribute');
 		$query->from('product_attribute', 'pa');