From 0501b637a3177cce441166b5fcfe27c9bd9fbe0f Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Tue, 18 Jan 2011 18:00:57 +0000
Subject: Merge branch devel-addressbook (r4193:4382) back into trunk

---
 program/steps/addressbook/import.inc | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'program/steps/addressbook/import.inc')

diff --git a/program/steps/addressbook/import.inc b/program/steps/addressbook/import.inc
index 61b757f43..532afdbcd 100644
--- a/program/steps/addressbook/import.inc
+++ b/program/steps/addressbook/import.inc
@@ -150,13 +150,8 @@ if ($_FILES['_file']['tmp_name'] && is_uploaded_file($_FILES['_file']['tmp_name'
         }
       }
       
-      $a_record = array(
-        'name' => $vcard->displayname,
-        'firstname' => $vcard->firstname,
-        'surname' => $vcard->surname,
-        'email' => $email,
-        'vcard' => $vcard->export(),
-      );
+      $a_record = $vcard->get_assoc();
+      $a_record['vcard'] = $vcard->export();
       
       $plugin = $RCMAIL->plugins->exec_hook('contact_create', array('record' => $a_record, 'source' => null));
       $a_record = $plugin['record'];
-- 
cgit v1.2.3