From: Stéphane Jacob <sj@m4x.org>
Date: Wed, 8 Dec 2010 12:38:34 +0000 (+0100)
Subject: Fixes bug in postal addresses formatting.
X-Git-Tag: xorg/1.0.2~94
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=b925fb20fa026c7f87924826df10fead936187f5;p=platal.git

Fixes bug in postal addresses formatting.

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---

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)) {