[jan] Export composite attributes to vCard too.

horde · May 29, 2014 · 089475c · 089475c
1 parent e284e4e
commit 089475c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/turba/docs/CHANGES b/turba/docs/CHANGES
@@ -2,6 +2,7 @@
 v4.2.0-git
 ----------
 
+[jan] Export composite attributes to vCard too.
 
 
 ------------

diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php
@@ -1120,6 +1120,7 @@ public function tovCard(Turba_Object $object, $version = '2.1',
         global $injector;
 
         $hash = $object->getAttributes();
+        $attributes = array_keys($this->map);
         $vcard = new Horde_Icalendar_Vcard($version);
         $formattedname = false;
         $charset = ($version == '2.1')
@@ -1129,7 +1130,8 @@ public function tovCard(Turba_Object $object, $version = '2.1',
         $hooks = $injector->getInstance('Horde_Core_Hooks');
         $decode_hook = $hooks->hookExists('decode_attribute', 'turba');
 
-        foreach ($hash as $key => $val) {
+        foreach ($attributes as $key) {
+            $val = $object->getValue($key);
             if ($skipEmpty && !strlen($val)) {
                 continue;
             }

diff --git a/turba/package.xml b/turba/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/apache">ASL</license>
  <notes>
-* 
+* [jan] Export composite attributes to vCard too.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -1838,7 +1838,7 @@
    <date>2014-05-05</date>
    <license uri="http://www.horde.org/licenses/apache">ASL</license>
    <notes>
-* 
+* [jan] Export composite attributes to vCard too.
    </notes>
   </release>
  </changelog>