From: Stéphane Jacob <sj@m4x.org>
Date: Sat, 12 Feb 2011 17:38:20 +0000 (+0100)
Subject: Fixes email notification when user chose the non-geocoded address.
X-Git-Tag: xorg/1.1.0~1^2~25
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=34088528ea47aa343911b3ec9e767cf90926d747;p=platal.git

Fixes email notification when user chose the non-geocoded address.

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

diff --git a/classes/address.php b/classes/address.php
index edd0874..8d1fa48 100644
--- a/classes/address.php
+++ b/classes/address.php
@@ -601,14 +601,14 @@ class Address
             $this->error = !empty($this->geocodedText);
         }
         if ($format['stripGeocoding'] || ($this->type == self::LINK_COMPANY && $this->error) || $this->geocodeChosen === '0') {
-            $gmapsGeocoder = new GMapsGeocoder();
-            $gmapsGeocoder->stripGeocodingFromAddress($this);
             if ($this->geocodeChosen === '0') {
                 $mailer = new PlMailer('profile/geocoding.mail.tpl');
                 $mailer->assign('text', $this->text);
                 $mailer->assign('geoloc', $this->geocodedText);
                 $mailer->send();
             }
+            $gmapsGeocoder = new GMapsGeocoder();
+            $gmapsGeocoder->stripGeocodingFromAddress($this);
         }
         if ($this->countryId == '') {
             $this->countryId = null;