Merge from CVS HEAD: 1.34.10.22

diff --git a/framework/Mime/lib/Horde/Mime/Viewer/vcard.php b/framework/Mime/lib/Horde/Mime/Viewer/vcard.php
index 1b2837e..d7e3956 100644 (file)
--- a/framework/Mime/lib/Horde/Mime/Viewer/vcard.php
+++ b/framework/Mime/lib/Horde/Mime/Viewer/vcard.php
@@ -132,13 +132,13 @@ class Horde_Mime_Viewer_vcard extends Horde_Mime_Viewer_Driver
             foreach ($labels as $label) {
                 if (isset($label['params']['TYPE'])) {
                     if (!is_array($item['params']['TYPE'])) {
-                        $item['params']['TYPE'] = array($item['params']['TYPE']);
+                        $label['params']['TYPE'] = array($label['params']['TYPE']);
                     }
                 } else {
-                    $item['params']['TYPE'] = array_keys($item['params']);
+                    $label['params']['TYPE'] = array_keys($label['params']);
                 }
                 $types = array();
-                foreach ($item['params']['TYPE'] as $type) {
+                foreach ($label['params']['TYPE'] as $type) {
                     switch(String::upper($type)) {
                     case 'HOME':
                         $types[] = _("Home Address");
@@ -167,12 +167,11 @@ class Horde_Mime_Viewer_vcard extends Horde_Mime_Viewer_Driver
                     case 'PREF':
                         $types[] = _("Preferred Address");
                         break;
-
-                    default:
-                        $types[] = _("Address");
-                        break;
                     }
                 }
+                if (!count($types)) {
+                    $types = array(_("Address"));
+                }
                 $html .= $this->_row(implode('/', $types), $label['value']);
             }
 
@@ -232,12 +231,11 @@ class Horde_Mime_Viewer_vcard extends Horde_Mime_Viewer_Driver
                     case 'PREF':
                         $types[] = _("Preferred Address");
                         break;
-
-                    default:
-                        $types[] = _("Address");
-                        break;
                     }
                 }
+                if (!count($types)) {
+                    $types = array(_("Address"));
+                }
                 $html .= $this->_row(implode('/', $types), implode("\n", $a));
             }