From 739c49b5a97dab909a40ff928ebabc1f8882b05a Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <sj@m4x.org>
Date: Sun, 28 Nov 2010 15:03:18 +0100
Subject: [PATCH] Fixes erroneous address formatting.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Stéphane Jacob <sj@m4x.org>
---
 classes/address.php                      | 2 +-
 upgrade/1.0.1/merge_issues_geocoding.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/address.php b/classes/address.php
index 61fba3d..81a5213 100644
--- a/classes/address.php
+++ b/classes/address.php
@@ -308,7 +308,7 @@ class Address
     {
         static $areas = array('administrativeArea', 'subAdministrativeArea', 'locality');
 
-        $this->format(array('postalText'));
+        $this->format(array('postalText' => true));
         if (!$this->isEmpty()) {
             foreach ($areas as $area) {
                 Geocoder::getAreaId($this, $area);
diff --git a/upgrade/1.0.1/merge_issues_geocoding.php b/upgrade/1.0.1/merge_issues_geocoding.php
index f274e43..6f9016e 100755
--- a/upgrade/1.0.1/merge_issues_geocoding.php
+++ b/upgrade/1.0.1/merge_issues_geocoding.php
@@ -23,7 +23,7 @@ $pid = 0;
 $jobid = 0;
 while ($item = $it->next()) {
     $address = new Address($item);
-    $address->format(array(true, true));
+    $address->format(array('requireGeocoding' => true, 'stripGeocoding' => true));
     $address->delete();
     $address->save();
     if (!($pid == $address->pid && $jobid == $address->jobid)) {
-- 
2.1.4