dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16990 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-08-24 08:07:44 +00:00
parent 33a7743691
commit efe90062c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
+3 -1
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';