From 252b3d4a19ea97a40e23fb34e1e8bfa9c39e8bf8 Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Mon, 1 Mar 2010 16:42:14 +0100
Subject: [PATCH] Only export non-empty fields.

---
 turba/lib/Api.php | 2 +-
 turba/vcard.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/turba/lib/Api.php b/turba/lib/Api.php
index f9061d004..a709bacac 100644
--- a/turba/lib/Api.php
+++ b/turba/lib/Api.php
@@ -815,7 +815,7 @@ class Turba_Api extends Horde_Registry_Api
         if ($driver instanceof PEAR_Error) {
             throw new Horde_Exception(sprintf(_("Connection failed: %s"), $driver->getMessage()));
         }
-        $vcard = $driver->tovCard($contact['contact'], '3.0');
+        $vcard = $driver->tovCard($contact['contact'], '3.0', null, true);
         $vcard->setAttribute('VERSION', '3.0');
 
         return $vcard->exportvCalendar();
diff --git a/turba/vcard.php b/turba/vcard.php
index 22d1d1753..dd4b04b69 100644
--- a/turba/vcard.php
+++ b/turba/vcard.php
@@ -43,4 +43,4 @@ $filename = str_replace(' ', '_', $object->getValue('name'));
 if (!$filename) {
     $filename = _("contact");
 }
-$vcard->exportFile($filename . '.vcf', array($driver->tovCard($object)), Horde_Nls::getCharset());
+$vcard->exportFile($filename . '.vcf', array($driver->tovCard($object, '2.1', null, true)), Horde_Nls::getCharset());
-- 
2.11.0