// Many improvements for Feature Detachable

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8648 b9a71923-0436-4b27-9f14-aed3839534dd

classes/SpecificPrice.php

@@ -68,9 +68,16 @@ class SpecificPriceCore extends ObjectModel
 
 	public static function getByProductId($id_product)
 	{
+<<<<<<< .mine
+		return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
+			SELECT *
+			FROM `'._DB_PREFIX_.'specific_price`
+			WHERE `id_product` = '.(int)$id_product);
+=======
 		return Db::getInstance()->ExecuteS('
 			SELECT * FROM `'._DB_PREFIX_.'specific_price` WHERE `id_product` = '.(int)$id_product
 		);
+>>>>>>> .r8644
 	}
 
 	public static function getIdsByProductId($id_product)
@@ -206,7 +213,11 @@ class SpecificPriceCore extends ObjectModel
 		');
 
 		$targeted_prices = array();
+<<<<<<< .mine
+		$last_quantity = NULL;
+=======
 		$last_quantity = null;
+>>>>>>> .r8644
 
 		foreach($res as $specific_price)
 		{
@@ -297,7 +308,7 @@ class SpecificPriceCore extends ObjectModel
 	{
 		if (self::$feature_active === null)
 			self::$feature_active = (bool)Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
-				SELECT COUNT(*)
+				SELECT `id_specific_price`
 				FROM `'._DB_PREFIX_.'specific_price`
 			');
 		return self::$feature_active;