From 43d56e2faf8ace7a4f672db7725972ca0d7baf5e Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 13 Feb 2012 10:08:59 +0000 Subject: [PATCH] // 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 --- classes/Configuration.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/classes/Configuration.php b/classes/Configuration.php index fb88aafbf..d4994c14a 100644 --- a/classes/Configuration.php +++ b/classes/Configuration.php @@ -448,6 +448,9 @@ class ConfigurationCore extends ObjectModel */ protected static function getShopFromContext(&$id_group_shop, &$id_shop) { + if (!Shop::isFeatureActive()) + return; + list($shopID, $shopGroupID) = Shop::getContext(); if (is_null($id_shop)) $id_shop = $shopID;