Branch 'roundcubemail-plugins-kolab-3.1' - plugins/libkolab

Thomas Brüderli bruederli at kolabsys.com
Mon Mar 24 18:05:00 CET 2014


 plugins/libkolab/lib/kolab_format.php |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 888b6c39045014ced3adfe626ce65067850c55f7
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Mar 24 18:03:34 2014 +0100

    Translate legacy X-Kolab-Type 'application/x-vnd.kolab.contact.distlist' into the right object type (#2942)

diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
index 679ae10..165b267 100644
--- a/plugins/libkolab/lib/kolab_format.php
+++ b/plugins/libkolab/lib/kolab_format.php
@@ -208,7 +208,11 @@ abstract class kolab_format
      */
     public static function mime2object_type($x_kolab_type)
     {
-        return preg_replace('/dictionary.[a-z.]+$/', 'dictionary', substr($x_kolab_type, strlen(self::KTYPE_PREFIX)));
+        return preg_replace(
+            array('/dictionary.[a-z.]+$/', '/contact.distlist$/'),
+            array( 'dictionary',            'distribution-list'),
+            substr($x_kolab_type, strlen(self::KTYPE_PREFIX))
+        );
     }
 
 




More information about the commits mailing list