From efe90062c9c6d7f58fd0694db356f2d5720e105d Mon Sep 17 00:00:00 2001 From: dMetzger Date: Fri, 24 Aug 2012 08:07:44 +0000 Subject: [PATCH] // Fixed multishop bug when multishop is not activated ^^ git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16990 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/controller/AdminController.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index ffb192110..ebda9d18c 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -2028,7 +2028,9 @@ class AdminControllerCore extends Controller $lang_join = 'LEFT JOIN `'._DB_PREFIX_.$this->table.'_lang` b ON (b.`'.$this->identifier.'` = a.`'.$this->identifier.'` AND b.`id_lang` = '.(int)$id_lang; if ($id_lang_shop) { - if (Shop::getContext() == Shop::CONTEXT_SHOP) + if (!Shop::isFeatureActive()) + $lang_join .= ' AND b.`id_shop` = 1'; + elseif (Shop::getContext() == Shop::CONTEXT_SHOP) $lang_join .= ' AND b.`id_shop` = '.(int)$id_lang_shop; else $lang_join .= ' AND b.`id_shop` = a.id_shop_default';