// small fix for id_shop and php-cli

2013-05-15 16:23:29 +02:00
parent 8d0e28291b
commit a22138f3c7
1 changed files with 5 additions and 2 deletions
@@ -352,7 +352,10 @@ class ShopCore extends ObjectModel
 		if ((!$id_shop && defined('_PS_ADMIN_DIR_')) || Tools::isPHPCLI())
 		{
 			// 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->virtual_uri = '';
 			
@@ -1130,4 +1133,4 @@ class ShopCore extends ObjectModel
 			($delete ? ' AND entity.deleted = 0' : '')
 		);
 	}
-}
+}