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

// Fix PSTEST-364

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12785 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard committed 2012-01-30 10:12:06 +00:00
1 parent d8f2908666
commit fdb2f11885
1 file changed
+1 -2
Download Patch File Download Diff File Expand all files Collapse all files
classes/SpecificPriceRule.php
+1 -2
View File
@@ -125,13 +125,12 @@ class SpecificPriceRuleCore extends ObjectModel
public function getConditions() public function getConditions()
{ {
$conditions = Db::getInstance()->executeS(' $conditions = Db::getInstance()->executeS('
SELECT g.* SELECT g.*, c.*
FROM '._DB_PREFIX_.'specific_price_rule_condition_group g FROM '._DB_PREFIX_.'specific_price_rule_condition_group g
LEFT JOIN '._DB_PREFIX_.'specific_price_rule_condition c LEFT JOIN '._DB_PREFIX_.'specific_price_rule_condition c
ON (c.id_specific_price_rule_condition_group = g.id_specific_price_rule_condition_group) ON (c.id_specific_price_rule_condition_group = g.id_specific_price_rule_condition_group)
WHERE g.id_specific_price_rule='.(int)$this->id WHERE g.id_specific_price_rule='.(int)$this->id
); );
$conditions_group = array(); $conditions_group = array();
if ($conditions) if ($conditions)
{ {