From 099c6a7080134b86463d5bad16f05995cd0f5040 Mon Sep 17 00:00:00 2001 From: rMalie Date: Tue, 17 Apr 2012 08:26:31 +0000 Subject: [PATCH] // Fix id_shop in URL for BO git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14670 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/shop/Shop.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index 21365d201..29efb8780 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -244,7 +244,7 @@ class ShopCore extends ObjectModel $excluded_uris[] = $directory; // Find current shop from URL - if (!($id_shop = Tools::getValue('id_shop')) && !defined('_PS_ADMIN_DIR_')) + if (!($id_shop = Tools::getValue('id_shop')) || defined('_PS_ADMIN_DIR_')) { $sql = 'SELECT s.id_shop, CONCAT(su.physical_uri, su.virtual_uri) AS uri, su.domain, su.main FROM '._DB_PREFIX_.'shop_url su