From 11d0e8247d3b8d314172d847b61903219c49d1d5 Mon Sep 17 00:00:00 2001
From: bettina <bettina@alumni.egroupware.org>
Date: Fri, 22 Jun 2001 05:55:15 +0000
Subject: [PATCH] update addresses

---
 addressbook/inc/class.contacts_shared.inc.php | 29 ++++++++++---------
 addressbook/templates/default/format_de.tpl   |  2 +-
 addressbook/templates/default/format_us.tpl   |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addressbook/inc/class.contacts_shared.inc.php b/addressbook/inc/class.contacts_shared.inc.php
index 7372d373bf..8e715ddbea 100644
--- a/addressbook/inc/class.contacts_shared.inc.php
+++ b/addressbook/inc/class.contacts_shared.inc.php
@@ -306,26 +306,27 @@
 
 			if ($country == 'DE')
 			{
-				$t->set_file(array('address_format' => 'format_de.tpl'));
+				$a = $t->set_file(array('address_format' => 'format_de.tpl'));
 			}
 				elseif ($country == 'US')
 			{
-				$t->set_file(array('address_format' => 'format_us.tpl'));
+				$a = $t->set_file(array('address_format' => 'format_us.tpl'));
 			}
 
-			$t->set_var('font',$font);
-			$t->set_var('title',$title);
-			$t->set_var('firstname',$address[0]['n_given']);
-			$t->set_var('lastname',$address[0]['n_family']);
-			$t->set_var('company',$address[0]['org_name']);
-			$t->set_var('department',$address[0]['org_unit']);
-			$t->set_var('street',$street);
-			$t->set_var('city',$city);
-			$t->set_var('zip',$zip);
-			$t->set_var('state',$state);
-			$t->set_var('country',$country);
+			$a .= $t->set_var('font',$font);
+			$a .= $t->set_var('title',$title);
+			$a .= $t->set_var('firstname',$address[0]['n_given']);
+			$a .= $t->set_var('lastname',$address[0]['n_family']);
+			$a .= $t->set_var('company',$address[0]['org_name']);
+			$a .= $t->set_var('department',$address[0]['org_unit']);
+			$a .= $t->set_var('street',$street);
+			$a .= $t->set_var('city',$city);
+			$a .= $t->set_var('zip',$zip);
+			$a .= $t->set_var('state',$state);
+			$a .= $t->set_var('country',lang($country));
 
-			$t->pparse('out','address_format');
+			$a .= $t->fp('out','address_format');
+			return $a;
 		}
 	}
 ?>
diff --git a/addressbook/templates/default/format_de.tpl b/addressbook/templates/default/format_de.tpl
index b54dc2a016..f40d64cd3c 100644
--- a/addressbook/templates/default/format_de.tpl
+++ b/addressbook/templates/default/format_de.tpl
@@ -1,7 +1,7 @@
 <!-- $Id$ -->
 <table border="0" cellpadding="2" cellspacing="2">
 	<tr> 
-		<td><font face="{font}">{title}&nbsp;{firstname}&nbsp;{lastname}</font></td>
+		<td><font face="{font}">{title}{firstname}&nbsp;{lastname}</font></td>
 	</tr>
 	<tr>
 		<td><font face="{font}">{company}</font></td>
diff --git a/addressbook/templates/default/format_us.tpl b/addressbook/templates/default/format_us.tpl
index 345e7f8dd2..c848b1750d 100644
--- a/addressbook/templates/default/format_us.tpl
+++ b/addressbook/templates/default/format_us.tpl
@@ -1,7 +1,7 @@
 <!-- $Id$ -->
 <table border="0" cellpadding="2" cellspacing="2">
 	<tr> 
-		<td><font face="{font}">{title}&nbsp;{firstname}&nbsp;{lastname}</font></td>
+		<td><font face="{font}">{title}{firstname}&nbsp;{lastname}</font></td>
 	</tr>
 	<tr>
 		<td><font face="{font}">{company}</font></td>