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

// small fix for id_shop and php-cli

Browse Source
This commit is contained in:
Rémi Gaillard
2013-05-15 16:23:29 +02:00
parent 8d0e28291b
commit a22138f3c7
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/Shop.php
+5 -2
View File
@@ -352,7 +352,10 @@ class ShopCore extends ObjectModel
if ((!$id_shop && defined('_PS_ADMIN_DIR_')) || Tools::isPHPCLI()) if ((!$id_shop && defined('_PS_ADMIN_DIR_')) || Tools::isPHPCLI())
{ {
// If in admin, we can access to the shop without right URL // If in admin, we can access to the shop without right URL
$shop = new Shop((int)Configuration::get('PS_SHOP_DEFAULT')); if (!$id_shop)
$id_shop = (int)Configuration::get('PS_SHOP_DEFAULT');
$shop = new Shop((int)$id_shop);
$shop->physical_uri = preg_replace('#/+#', '/', str_replace('\\', '/', dirname(dirname($_SERVER['SCRIPT_NAME']))).'/'); $shop->physical_uri = preg_replace('#/+#', '/', str_replace('\\', '/', dirname(dirname($_SERVER['SCRIPT_NAME']))).'/');
$shop->virtual_uri = ''; $shop->virtual_uri = '';
@@ -1130,4 +1133,4 @@ class ShopCore extends ObjectModel
($delete ? ' AND entity.deleted = 0' : '') ($delete ? ' AND entity.deleted = 0' : '')
); );
} }
} }