summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2013-04-18 13:45:00 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2013-04-18 13:45:00 (GMT)
commitf958537e55008f79977acc17ef006640537ed91b (patch)
treed9429af97c427e78d4f441aae9a02fc37444bc59
parentdb055e29c71b4c7d9ecde94f0550ee705633432c (diff)
downloadroundcubemail-plugins-kolab-f958537e55008f79977acc17ef006640537ed91b.tar.gz
Fix bug where contacts were moved instead of copied. Internal date
need to be cleared when converting from kolab to Roundcube format (Bug #1767)
-rw-r--r--plugins/kolab_addressbook/lib/rcube_kolab_contacts.php7
1 files changed, 6 insertions, 1 deletions
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;
}
/**