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

// Fix admin controller

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15212 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-05-11 09:55:21 +00:00
parent 403d22ac5c
commit f91dc64cad
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
classes/controller/AdminController.php
View File

@@ -1670,6 +1670,8 @@ class AdminControllerCore extends Controller
}
elseif (!Shop::isFeatureActive())
$this->context->cookie->shopContext = 's-'.Configuration::get('PS_SHOP_DEFAULT');
else if (Shop::getTotalShops(false, null) < 2)
$this->context->cookie->shopContext = 's-'.$this->context->employee->getDefaultShopID();
$shop_id = '';
Shop::setContext(Shop::CONTEXT_ALL);
@@ -1700,11 +1702,6 @@ class AdminControllerCore extends Controller
}
}
}
else if (Shop::getTotalShops(false, null) < 2)
{
$shop_id = $this->context->employee->getDefaultShopID();
Shop::setContext(Shop::CONTEXT_SHOP, $shop_id);
}
// Check multishop context and set right context if need
if (!($this->multishop_context & Shop::getContext()))