From b925fb20fa026c7f87924826df10fead936187f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Wed, 8 Dec 2010 13:38:34 +0100 Subject: [PATCH] Fixes bug in postal addresses formatting. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- classes/address.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/classes/address.php b/classes/address.php index 92752d5..3d00c2b 100644 --- a/classes/address.php +++ b/classes/address.php @@ -538,8 +538,8 @@ class Address $countries = array_map('replace_accent', $countries); $countries = array_map('strtoupper', $countries); $count = count($arrayText); - if (in_array(strtoupper($address->country), Address::$formattings)) { - $text = call_user_func(array($this, 'formatPostalAddress' . Address::$formattings[strtoupper($address->country)]), $arrayText); + if (in_array(strtoupper($this->countryId), Address::$formattings)) { + $text = call_user_func(array($this, 'formatPostalAddress' . strtoupper($this->countryId)), $arrayText); } elseif (array_key_exists($arrayText[$count - 1], Address::$formattings)) { $text = call_user_func(array($this, 'formatPostalAddress' . Address::$formattings[$arrayText[$count - 1]]), $arrayText); } elseif (!in_array($arrayText[$count - 1], $countries)) { -- 2.1.4