From 29cede486df6cda272a383f9833bb61fd8ffc7b5 Mon Sep 17 00:00:00 2001 From: rGaillard Date: Mon, 30 Jan 2012 10:12:06 +0000 Subject: [PATCH] // Fix PSTEST-364 --- classes/SpecificPriceRule.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/classes/SpecificPriceRule.php b/classes/SpecificPriceRule.php index 3a3f59d6f..44a68018a 100755 --- a/classes/SpecificPriceRule.php +++ b/classes/SpecificPriceRule.php @@ -125,13 +125,12 @@ class SpecificPriceRuleCore extends ObjectModel public function getConditions() { $conditions = Db::getInstance()->executeS(' - SELECT g.* + SELECT g.*, c.* FROM '._DB_PREFIX_.'specific_price_rule_condition_group g LEFT JOIN '._DB_PREFIX_.'specific_price_rule_condition c ON (c.id_specific_price_rule_condition_group = g.id_specific_price_rule_condition_group) WHERE g.id_specific_price_rule='.(int)$this->id ); - $conditions_group = array(); if ($conditions) {