From ab74fbeca01a4be03539bf9dbebf0daebfb25928 Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sat, 23 Jun 2007 07:09:52 +0000
Subject: [PATCH] "fix for bug #953: Addresbook Contact Info ignores Default
 Address Format Rule"

---
 addressbook/inc/class.uicontacts.inc.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/addressbook/inc/class.uicontacts.inc.php b/addressbook/inc/class.uicontacts.inc.php
index 3024e0af6e..31841057a4 100644
--- a/addressbook/inc/class.uicontacts.inc.php
+++ b/addressbook/inc/class.uicontacts.inc.php
@@ -1518,6 +1518,10 @@ class uicontacts extends bocontacts
 // ToDo: fix vCard export
 $readonlys['button[vcard]'] = true;
 
+		// how to display addresses
+		$content['addr_format']  = $this->addr_format_by_country($content['adr_one_countryname']);
+		$content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']);
+		
 		$sel_options['fileas_type'][$content['fileas_type']] = $this->fileas($content);
 		$sel_options['owner'] = $this->get_addressbooks();
 		for($i = -23; $i<=23; $i++) $tz[$i] = ($i > 0 ? '+' : '').$i;