From c7fe97d5d35a3ee841f98c66e9de64d4bff4bd61 Mon Sep 17 00:00:00 2001 From: lLefevre Date: Fri, 13 Jul 2012 08:23:39 +0000 Subject: [PATCH] [-] BO : fix #PSCFV-3102 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16402 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 4dc82645b..9b957a7d7 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -401,7 +401,7 @@ class ShopCore extends ObjectModel { $address = new Address(); $address->company = Configuration::get('PS_SHOP_NAME'); - $address->id_country = Configuration::get('PS_SHOP_COUNTRY_ID'); + $address->id_country = Configuration::get('PS_SHOP_COUNTRY_ID') ? Configuration::get('PS_SHOP_COUNTRY_ID') : Configuration::get('PS_COUNTRY_DEFAULT'); $address->id_state = Configuration::get('PS_SHOP_STATE_ID'); $address->address1 = Configuration::get('PS_SHOP_ADDR1'); $address->address2 = Configuration::get('PS_SHOP_ADDR2');