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:56:31 (GMT)
commit60ff67133686ea575aff4811f59d604c1ebf2797 (patch)
treecd588d7a688a5187b87456e0967a517b59bca9cc
parentdac9965e024fb4b3d6d88684cff12842c95890ef (diff)
downloadroundcubemail-plugins-kolab-60ff67133686ea575aff4811f59d604c1ebf2797.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 756f514..16a8811 100644
--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
@@ -1095,7 +1095,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;
}
/**