From: Stéphane Jacob <jacou@melix.net>
Date: Sun, 15 Feb 2009 02:32:31 +0000 (+0100)
Subject: Fixes geolocalization.
X-Git-Tag: xorg/1.0.0~332^2~344^2~21
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=89cd26b1e8222b44bab3e1294fdd49015cbdb02e;p=platal.git

Fixes geolocalization.
---

diff --git a/include/geoloc.inc.php b/include/geoloc.inc.php
index c776e42..ff58ddb 100644
--- a/include/geoloc.inc.php
+++ b/include/geoloc.inc.php
@@ -335,7 +335,8 @@ function formatAddress(array &$address)
                                       array("", "\n"), $address['text']));
     $geoloc = strtoupper(preg_replace(array("/[0-9,\"'#~:;_\- ]/", "/\r\n/"),
                                       array("", "\n"), $address['geoloc']));
-    if (isset($address['extras'])) {
+    if (isset($address['extras']) && $address['extras']) {
+        $address['geoloc'] = $address['extras'] . "\n" . $address['geoloc'];
         $extras = strtoupper(preg_replace(array("/[0-9,\"'#~:;_\- ]/", "/\r\n/"),
                                           array("", "\n"), $address['extras']));
         $geoloc = $extras . $geoloc;
diff --git a/modules/profile/page.inc.php b/modules/profile/page.inc.php
index b46e23a..8408c15 100644
--- a/modules/profile/page.inc.php
+++ b/modules/profile/page.inc.php
@@ -275,6 +275,8 @@ abstract class ProfileGeoloc implements ProfileSetting
             $mailer->assign('text', $address['text']);
             $mailer->assign('geoloc', $address['geoloc']);
             $mailer->send();
+        } elseif (isset($address['geoloc_choice'])) {
+            unset($address['geoloc'], $address['geoloc_choice']);
         }
     }
 }