// Context part 32

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8095 b9a71923-0436-4b27-9f14-aed3839534dd

classes/Customer.php

@@ -606,7 +606,8 @@ class CustomerCore extends ObjectModel
 	/**
 	  * Check customer informations and return customer validity
 	  *
-	  * @parma boolean $withGuest 
+	  * @since 1.5.0
+	  * @param boolean $withGuest 
 	  * @return boolean customer validity
 	  */
 	public function isLogged($withGuest = false)
@@ -622,6 +623,8 @@ class CustomerCore extends ObjectModel
 	
 	/**
 	  * Logout
+	  * 
+	  * @since 1.5.0
 	  */
 	public function logout()
 	{
@@ -633,6 +636,8 @@ class CustomerCore extends ObjectModel
 	/**
 	  * Soft logout, delete everything links to the customer
 	  * but leave there affiliate's informations
+	  * 
+	  * @since 1.5.0
 	  */
 	public function mylogout()
 	{

classes/PDF.php

@@ -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));