From 40773983a83c21167af777753c5fd527cc12543c Mon Sep 17 00:00:00 2001
From: Michael J Rubinsky <mrubinsk@horde.org>
Date: Mon, 16 Jun 2014 20:35:51 -0400
Subject: [PATCH] Fix regression introduced by: 089475cf

---
 turba/lib/Driver.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/turba/lib/Driver.php b/turba/lib/Driver.php
index b8d59990780..39353c21fce 100644
--- a/turba/lib/Driver.php
+++ b/turba/lib/Driver.php
@@ -1132,7 +1132,7 @@ public function tovCard(Turba_Object $object, $version = '2.1',
 
         foreach ($attributes as $key) {
             $val = $object->getValue($key);
-            if ($skipEmpty && !strlen($val)) {
+            if ($skipEmpty && !is_array($val) && !strlen($val)) {
                 continue;
             }
             if ($decode_hook) {
@@ -1810,7 +1810,7 @@ public function tovCard(Turba_Object $object, $version = '2.1',
                     break;
                 }
                 $vcard->setAttribute($name,
-                                     base64_encode($val),
+                                     base64_encode($hash[$key]),
                                      $params);
                 break;
             }