From 0b44e0c3f1d60b8c2aa9f9850b8d6f9cbd7301f7 Mon Sep 17 00:00:00 2001
From: Armin Hackmann <armin@fruux.com>
Date: Tue, 13 Aug 2013 14:09:49 +0200
Subject: [PATCH] Setting correct property group on VCard conversion

---
 ChangeLog                                  | 3 +++
 lib/Sabre/VObject/VCardConverter.php       | 2 ++
 lib/Sabre/VObject/Version.php              | 2 +-
 tests/Sabre/VObject/VCardConverterTest.php | 4 ++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 16309bdef..29d0d00c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+3.1.2-stable (2013-08-13)
+    * Fixed: Setting correct property group on VCard conversion
+
 3.1.1-stable (2013-08-02)
 	* Fixed: Issue #53. A regression in RecurrenceIterator.
 
diff --git a/lib/Sabre/VObject/VCardConverter.php b/lib/Sabre/VObject/VCardConverter.php
index 0b4cffc4c..6c74c8ca7 100644
--- a/lib/Sabre/VObject/VCardConverter.php
+++ b/lib/Sabre/VObject/VCardConverter.php
@@ -144,6 +144,8 @@ protected function convertProperty(Component\VCard $input, Component\VCard $outp
 
         }
 
+        // set property group
+        $newProperty->group = $property->group;
 
         if ($targetVersion===Document::VCARD40) {
             $this->convertParameters40($newProperty, $parameters);
diff --git a/lib/Sabre/VObject/Version.php b/lib/Sabre/VObject/Version.php
index c09f0d509..365434e56 100644
--- a/lib/Sabre/VObject/Version.php
+++ b/lib/Sabre/VObject/Version.php
@@ -14,6 +14,6 @@ class Version {
     /**
      * Full version number
      */
-    const VERSION = '3.1.1';
+    const VERSION = '3.1.2';
 
 }
diff --git a/tests/Sabre/VObject/VCardConverterTest.php b/tests/Sabre/VObject/VCardConverterTest.php
index 962a24a6c..55f2bae7f 100644
--- a/tests/Sabre/VObject/VCardConverterTest.php
+++ b/tests/Sabre/VObject/VCardConverterTest.php
@@ -14,6 +14,8 @@ function testConvert30to40() {
 PRODID:foo
 FN;CHARSET=UTF-8:Steve
 TEL;TYPE=PREF,HOME:+1 555 666 777
+ITEM1.TEL:+1 444 555 666
+ITEM1.X-ABLABEL:CustomLabel
 PHOTO;ENCODING=b;TYPE=JPEG,HOME:Zm9v
 PHOTO;ENCODING=b;TYPE=GIF:Zm9v
 PHOTO;X-PARAM=FOO;ENCODING=b;TYPE=PNG:Zm9v
@@ -29,6 +31,8 @@ function testConvert30to40() {
 PRODID:-//Sabre//Sabre VObject {$version}//EN
 FN:Steve
 TEL;PREF=1;TYPE=HOME:+1 555 666 777
+ITEM1.TEL:+1 444 555 666
+ITEM1.X-ABLABEL:CustomLabel
 PHOTO;TYPE=HOME:data:image/jpeg;base64,Zm9v
 PHOTO:data:image/gif;base64,Zm9v
 PHOTO;X-PARAM=FOO:data:image/png;base64,Zm9v