// Fixed multishop bug when multishop is not activated ^^

This commit is contained in:
dMetzger
2012-08-24 08:07:44 +00:00
parent 402856e83a
commit 6bd6350b53

View File

@@ -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';