[-] BO : BugFix : #PSCFV-2373 : Problem on country creation

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15336 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-16 13:17:07 +00:00
parent ce873cebc5
commit bb1fa8fd52
3 changed files with 2 additions and 4 deletions
@@ -195,7 +195,7 @@ abstract class ObjectModelCore
 				if ($id_lang)
 				{
 					$sql->leftJoin($this->def['table'].'_lang', 'b', 'a.'.$this->def['primary'].' = b.'.$this->def['primary'].' AND b.id_lang = '.(int)$id_lang);
-					if ($this->id_shop)
+					if ($this->id_shop && !empty($this->def['multilang_shop']))
 						$sql->where('b.id_shop = '.$this->id_shop);
 				}