// Context part 32

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8095 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 13:40:05 +00:00
parent 51f2bf2617
commit 39d005f222
14 changed files with 24 additions and 20 deletions
@@ -189,7 +189,7 @@ class PDFCore extends PDF_PageGroupCore
   private function _builMerchantFooterDetail($conf)
   {
 		// If the country is USA
-	   	if (Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT')) == 'US')
+	   	if (Context::getContext()->country->iso_code == 'US')
 	   	{
 	   		$completeAddressShop = $this->_getCompleteUSAddressFormat($conf);
 	   	
@@ -449,7 +449,7 @@ class PDFCore extends PDF_PageGroupCore
 						if (!in_array($pattern, $patternRules['avoid']))
 						{
 							if ($pattern == 'State:name' && 
-								Country::getIsoById(Configuration::get('PS_COUNTRY_DEFAULT')) == 'US')
+								Context::getContext()->country->iso_code == 'US')
 							{
 								$state = &$addressType[$type]['addressFormatedValues'][$pattern];
 								$state = strtoupper(substr($state, 0, 2));