Branch 'roundcubemail-plugins-kolab-format2-horde5' - plugins/libkolab

[Aleksander Machniak]

 plugins/libkolab/lib/kolab_format_contact.php |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c210cfd1ff14e666cc7c59014a97c8b891215ff6
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Mon Jul 1 08:28:54 2013 +0200

    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

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;