From a97d64d769ff078ac32f74dde5ab3042724a8a24 Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Thu, 5 Jun 2008 14:39:06 +0000
Subject: [PATCH] commited stefan beckers patch for the replacement of rtf
 tags:avoid $$fields in RTF Dodument instead of emty values

---
 addressbook/inc/class.addressbook_merge.inc.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_merge.inc.php b/addressbook/inc/class.addressbook_merge.inc.php
index 0fd5ed5db8..211806796f 100644
--- a/addressbook/inc/class.addressbook_merge.inc.php
+++ b/addressbook/inc/class.addressbook_merge.inc.php
@@ -64,8 +64,9 @@ class addressbook_merge	// extends bo_merge
 		if (!is_array($contact)) return array();
 
 		$replacements = array();
-		foreach($contact as $name => $value)
+		foreach(array_keys($this->contacts->contact_fields) as $name)
 		{
+			$value = $contact[$name];
 			switch($name)
 			{
 				case 'created': case 'modified':
@@ -325,4 +326,4 @@ class addressbook_merge	// extends bo_merge
 
 		$GLOBALS['egw']->common->egw_footer();
 	}
-}
\ No newline at end of file
+}