// Fix #PSCFV-4569

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17662 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-10-01 16:16:54 +00:00
parent 57c92993e3
commit 4f6de85447
3 changed files with 3 additions and 2 deletions
+1 -1
View File
@@ -1040,7 +1040,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']).'`)';
$sql_filter = 'AND id_shop = '.Context::getContext()->shop->id.' '.$sql_filter;
$sql_filter = 'AND `multi_shop_'.bqSQL($this->def['table']).'`.id_shop = '.Context::getContext()->shop->id.' '.$sql_filter;
$sql_join = $multi_shop_join.' '.$sql_join;
}
else