From 7f5418fd5e2a50a9c6c51a501167079ae6a501dc Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <jacou@melix.net>
Date: Sun, 12 Apr 2009 15:47:13 +0200
Subject: [PATCH] Fixes address edition: only notifies an address modification
 if it is actually modified.

---
 modules/profile/addresses.inc.php | 11 ++++++++++-
 templates/geoloc/form.address.tpl |  8 --------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/modules/profile/addresses.inc.php b/modules/profile/addresses.inc.php
index 49b7f95..c6cb2c2 100644
--- a/modules/profile/addresses.inc.php
+++ b/modules/profile/addresses.inc.php
@@ -207,9 +207,18 @@ class ProfileAddresses extends ProfilePage
         }
         foreach ($this->values['addresses'] as $id => &$address) {
             if (!isset($address['tel'])) {
-                $address['tel'] = array();
+                $address['tel'] = array(
+                                 0 => array(
+                                     'type'    => 'fixed',
+                                     'tel'     => '',
+                                     'pub'     => 'private',
+                                     'comment' => '',
+                                     )
+                                 );
             }
             unset($address['id']);
+            $address['changed'] = 0;
+            $address['removed'] = 0;
         }
     }
 }
diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index 50ecdf3..229d1e8 100644
--- a/templates/geoloc/form.address.tpl
+++ b/templates/geoloc/form.address.tpl
@@ -49,19 +49,11 @@
 <input type="hidden" name="{$prefname}[geocodedPostalText]" value="{$address.geocodedPostalText}" />
 <input type="hidden" name="{$prefname}[updateTime]" value="{$address.updateTime}" />
 {/if}
-<input type="hidden" name="{$prefname}[type]" value="{$address.type}" />
 <input type="hidden" name="{$prefname}[accuracy]" value="{$address.accuracy}" />
-<input type="hidden" name="{$prefname}[postalAddress]" value="{$address.postalAddress}" />
 <input type="hidden" name="{$prefname}[postalText]" value="{$address.postalText}" />
-<input type="hidden" name="{$prefname}[line1]" value="{$address.line1}" />
-<input type="hidden" name="{$prefname}[line2]" value="{$address.line2}" />
-<input type="hidden" name="{$prefname}[line3]" value="{$address.line3}" />
 <input type="hidden" name="{$prefname}[postalCode]" value="{$address.postalCode}" />
 <input type="hidden" name="{$prefname}[administrativeAreaId]" value="{$address.administrativeAreaId}" />
 <input type="hidden" name="{$prefname}[subAdministrativeAreaId]" value="{$address.subAdministrativeAreaId}" />
-<input type="hidden" name="{$prefname}[locality]" value="{$address.locality}" />
-<input type="hidden" name="{$prefname}[administrativeArea]" value="{$address.administrativeArea}" />
-<input type="hidden" name="{$prefname}[subAdministrativeArea]" value="{$address.subAdministrativeArea}" />
 <input type="hidden" name="{$prefname}[localityId]" value="{$address.localityId}" />
 <input type="hidden" name="{$prefname}[countryId]" value="{$address.countryId}" />
 <input type="hidden" name="{$prefname}[latitude]" value="{$address.latitude}" />
-- 
2.1.4