From e7fb8e061fb7d785b433057c0c1a399c70d4a6e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Sat, 8 Jan 2011 00:26:45 +0100 Subject: [PATCH] Removes duplicated city and postal code in vcard addresses (Closes #1322). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- include/vcard.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/include/vcard.inc.php b/include/vcard.inc.php index d00cf3a..758714e 100644 --- a/include/vcard.inc.php +++ b/include/vcard.inc.php @@ -90,8 +90,7 @@ class VCard extends PlVCard null, $adr->administrativeArea, null, $adr->hasFlag('current'), $adr->hasFlag('mail'), $adr->hasFlag('mail')); } else { - // TODO : find a way to fetch only the "street" part of the address - $group = $entry->addHome($adr->text, null, null, $adr->postalCode, + $group = $entry->addHome(trim(Geocoder::getFirstLines($adr->text, $adr->postalCode, 4)), null, null, $adr->postalCode, $adr->locality, $adr->administrativeArea, $adr->country, $adr->hasFlag('current'), $adr->hasFlag('mail'), $adr->hasFlag('mail')); } @@ -115,7 +114,7 @@ class VCard extends PlVCard } else { // TODO : link address to company $group = $entry->addWork(null, null, null, null, - $adr->text, null, null, $adr->postalCode, + trim(Geocoder::getFirstLines($adr->text, $adr->postalCode, 4)), null, null, $adr->postalCode, $adr->locality, $adr->administrativeArea, $adr->country); } foreach ($adr->phones() as $phone) { -- 2.1.4