// Fix configuration when multishop is disabled
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13246 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
@@ -448,6 +448,9 @@ class ConfigurationCore extends ObjectModel
|
|||||||
*/
|
*/
|
||||||
protected static function getShopFromContext(&$id_group_shop, &$id_shop)
|
protected static function getShopFromContext(&$id_group_shop, &$id_shop)
|
||||||
{
|
{
|
||||||
|
if (!Shop::isFeatureActive())
|
||||||
|
return;
|
||||||
|
|
||||||
list($shopID, $shopGroupID) = Shop::getContext();
|
list($shopID, $shopGroupID) = Shop::getContext();
|
||||||
if (is_null($id_shop))
|
if (is_null($id_shop))
|
||||||
$id_shop = $shopID;
|
$id_shop = $shopID;
|
||||||
|
|||||||
Reference in New Issue
Block a user