From 0d20a7a1dbc4f0f18925dac2b87a71f6e5a95285 Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 8 Feb 2012 14:33:52 +0000 Subject: [PATCH] // Fix langMultiShop in ObjectModel git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13132 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/ObjectModel.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 7977739c2..806cd8757 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -197,7 +197,7 @@ abstract class ObjectModelCore { $sql = 'SELECT * FROM `'.pSQL(_DB_PREFIX_.$this->def['table']).'_lang` WHERE `'.$this->def['primary'].'` = '.(int)$id - .(($this->id_shop) ? ' AND `id_shop` = '.$this->id_shop : ''); + .(($this->id_shop && $this->isLangMultishop()) ? ' AND `id_shop` = '.$this->id_shop : ''); $result = Db::getInstance()->executeS($sql); if ($result) foreach ($result as $row)