summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2013-07-01 06:28:54 (GMT)
committerAleksander Machniak <alec@alec.pl>2014-08-01 10:32:38 (GMT)
commitc210cfd1ff14e666cc7c59014a97c8b891215ff6 (patch)
treee636047928e78bafb19b5259b2adeb82f9ca510c
parentd1a56f70e5265421cf182500e9d070af039c281c (diff)
downloadroundcubemail-plugins-kolab-c210cfd1ff14e666cc7c59014a97c8b891215ff6.tar.gz
Force setting internal object type to prevent type overwrite
when copying contacts from other sources (e.g. LDAP) (Bug #1990) Conflicts: plugins/libkolab/lib/kolab_format_contact.php
-rw-r--r--plugins/libkolab/lib/kolab_format_contact.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/plugins/libkolab/lib/kolab_format_contact.php b/plugins/libkolab/lib/kolab_format_contact.php
index 45b7a6d..2f64095 100644
--- a/plugins/libkolab/lib/kolab_format_contact.php
+++ b/plugins/libkolab/lib/kolab_format_contact.php
@@ -210,6 +210,8 @@ class kolab_format_contact extends kolab_format
$this->kolab_object['office-location'] = $adr['locality'];
}
}
+ // set type property for proper caching
+ $object['_type'] = 'contact';
// cache this data
$this->data = $object;