2 commits - plugins/kolab_addressbook

[Aleksander Machniak]

 plugins/kolab_addressbook/lib/rcube_kolab_contacts.php |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 08332b5238d4fa0357c3e24cc18c2287c3a18954
Merge: f958537 82907b0
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Thu Apr 18 15:46:51 2013 +0200

    Merge branch 'master' of ssh://git.kolab.org/git/roundcube



commit f958537e55008f79977acc17ef006640537ed91b
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Thu Apr 18 15:45:00 2013 +0200

    Fix bug where contacts were moved instead of copied. Internal date
    need to be cleared when converting from kolab to Roundcube format (Bug #1767)

diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
index 9725503..4ff585f 100644
--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
@@ -1080,7 +1080,12 @@ class rcube_kolab_contacts extends rcube_addressbook
             $record['pgppublickey'] = substr($record['pgppublickey'], 0, 140) . '...';
 
         // remove empty fields
-        return array_filter($record);
+        $record = array_filter($record);
+
+        // remove kolab_storage internal data
+        unset($record['_msguid'], $record['_formatobj'], $record['_mailbox'], $record['_type'], $record['_size']);
+
+        return $record;
     }
 
     /**