Index: class.contacts_shared.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.contacts_shared.inc.php,v retrieving revision 1.9.2.1.2.3 diff -u -r1.9.2.1.2.3 class.contacts_shared.inc.php --- class.contacts_shared.inc.php 8 Sep 2003 13:26:38 -0000 1.9.2.1.2.3 +++ class.contacts_shared.inc.php 25 Oct 2003 17:23:48 -0000 @@ -347,11 +347,11 @@ if (file_exists(PHPGW_SERVER_ROOT . SEP . 'addressbook' . SEP . 'templates' . SEP .'default' . SEP . 'format_' . strtolower($country) . '.tpl')) { - $a = $t->set_file(array('address_format' => 'format_' . strtolower($country) . '.tpl')); + $t->set_file(array('address_format' => 'format_' . strtolower($country) . '.tpl')); } else { - $a = $t->set_file(array('address_format' => 'format_us.tpl')); + $t->set_file(array('address_format' => 'format_us.tpl')); } if (!$afont) @@ -359,23 +359,22 @@ $afont = $GLOBALS['phpgw_info']['theme']['font']; } - $a .= $t->set_var('font',$afont); - $a .= $t->set_var('fontsize',$asize); - $a .= $t->set_var('company',$company); - $a .= $t->set_var('department',$address['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); + $t->set_var('font',$afont); + $t->set_var('fontsize',$asize); + $t->set_var('company',$company); + $t->set_var('department',$address['org_unit']); + $t->set_var('street',$street); + $t->set_var('city',$city); + $t->set_var('zip',$zip); + $t->set_var('state',$state); if ($country != $GLOBALS['phpgw_info']['user']['preferences']['common']['country']) { $countryname = $s->get_full_name($country); - $a .= $t->set_var('country',lang($countryname)); + $t->set_var('country',lang($countryname)); } - $a .= $t->fp('out','address_format'); - return $a; + return $t->fp('out','address_format'); } function formatted_address_full($id, $business = True, $afont = '', $asize = '2')