dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] WS : Fix id_shop behavior when use WS or script

Browse Source
This commit is contained in:
aKorczak
2012-08-27 15:27:18 +00:00
parent b0e4c60d05
commit 0f3f1cb293
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/Shop.php
+4 -4
View File
@@ -295,10 +295,6 @@ class ShopCore extends ObjectModel
*/ */
public static function initialize() public static function initialize()
{ {
// Optimization - don't redirect and allow WS and other script to work
if (!($id_shop = Tools::getValue('id_shop')))
$_GET['id_shop'] = Configuration::get('PS_SHOP_DEFAULT');
// Find current shop from URL // 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_'))
{ {
@@ -331,6 +327,10 @@ 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 an URL was found but is not the main URL, redirect to main URL
if ($id_shop && !$is_main_uri) if ($id_shop && !$is_main_uri)
{ {