// Fix PSTEST-364

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12785 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-30 10:12:06 +00:00
parent d8f2908666
commit fdb2f11885
1 changed files with 1 additions and 2 deletions
@@ -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)
 		{