// 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
2012-02-13 10:08:59 +00:00
parent ecc49b160e
commit 43d56e2faf
1 changed files with 3 additions and 0 deletions
@@ -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;