dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// clean conflict lines in SpecificPrice file

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8653 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
aFolletete
2011-09-20 08:38:43 +00:00
parent 58c8c71018
commit 738590890e
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/SpecificPrice.php
-10
View File
@@ -68,16 +68,10 @@ class SpecificPriceCore extends ObjectModel
public static function getByProductId($id_product) public static function getByProductId($id_product)
{ {
<<<<<<< .mine
return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS(' return Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT * SELECT *
FROM `'._DB_PREFIX_.'specific_price` FROM `'._DB_PREFIX_.'specific_price`
WHERE `id_product` = '.(int)$id_product); 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) public static function getIdsByProductId($id_product)
@@ -213,11 +207,7 @@ class SpecificPriceCore extends ObjectModel
'); ');
$targeted_prices = array(); $targeted_prices = array();
<<<<<<< .mine
$last_quantity = NULL;
=======
$last_quantity = null; $last_quantity = null;
>>>>>>> .r8644
foreach($res as $specific_price) foreach($res as $specific_price)
{ {