From a057ac8e2e67d716c886c770eb46dc8d31670082 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 --- 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;