From 37ddd943edd7dee1069bd84483ff05759997275d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Tue, 27 Nov 2012 14:52:15 +0100
Subject: [PATCH] [-] FO: Fix cookie problem when accessing not accessing to
 the shop with the main url

---
 classes/shop/Shop.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php
index 0f436a028..d0a426706 100644
--- a/classes/shop/Shop.php
+++ b/classes/shop/Shop.php
@@ -330,10 +330,6 @@ class ShopCore extends ObjectModel
 				}
 			}
 
-			// Optimization - don't redirect and allow WS and other script to work
-			if (!$id_shop)
-				$id_shop = Configuration::get('PS_SHOP_DEFAULT');
-
 			// If an URL was found but is not the main URL, redirect to main URL
 			if ($id_shop && !$is_main_uri)
 			{