From 2ffab71fc2ef951a171a81976408ea02b0cf651f Mon Sep 17 00:00:00 2001 From: aKorczak Date: Fri, 31 Aug 2012 16:04:18 +0000 Subject: [PATCH] [-] WS : Fix 1.5 compatibility git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17140 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/ObjectModel.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 4a51d5b46..58ccd476d 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -1035,12 +1035,7 @@ abstract class ObjectModelCore $multi_shop_join = ' LEFT JOIN `'._DB_PREFIX_.bqSQL($this->def['table']).'_'.bqSQL($assoc['type']).'` AS `multi_shop_'.bqSQL($this->def['table']).'` ON (main.`'.bqSQL($this->def['primary']).'` = `multi_shop_'.bqSQL($this->def['table']).'`.`'.bqSQL($this->def['primary']).'`)'; - foreach ($vars['shopIDs'] as $id_shop) - $or[] = ' `multi_shop_'.bqSQL($this->def['table']).'`.id_shop = '.(int)$id_shop.' '; - $prepend = ''; - if (count($or)) - $prepend = 'AND ('.implode('OR', $or).')'; - $sql_filter = $prepend.$sql_filter; + $sql_filter = 'AND id_shop = '.Context::getContext()->shop->id.' '.$sql_filter; $sql_join = $multi_shop_join.' '.$sql_join; } else