diff --git a/phpgwapi/inc/class.sbox.inc.php b/phpgwapi/inc/class.sbox.inc.php index a7327b54de..f8dcc2e1ae 100644 --- a/phpgwapi/inc/class.sbox.inc.php +++ b/phpgwapi/inc/class.sbox.inc.php @@ -625,9 +625,9 @@ return($this->country_array[$selected]); } - function formatted_address($country = '',$id = '',$fields = '',$business = True) + function formatted_address($id = '',$fields = '',$business = True) { - global $phpgw,$phpgw_info,$d; + global $phpgw,$phpgw_info; $font = $phpgw_info['theme']['font']; @@ -656,7 +656,7 @@ $city = $address[0]['adr_one_locality']; $zip = $address[0]['adr_one_postalcode']; $state = $address[0]['adr_one_region']; - $newcountry = $address[0]['address_one_countryname']; + $country = $address[0]['adr_one_countryname']; } else { @@ -664,16 +664,16 @@ $city = $address[0]['adr_two_locality']; $zip = $address[0]['adr_two_postalcode']; $state = $address[0]['adr_two_region']; - $newcountry = $address[0]['address_two_countryname']; + $country = $address[0]['adr_two_countryname']; } $a .= '