From 882dd3b26b8a2c465cc05d63391d6b3c69b633bf Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 15 Dec 2008 11:53:53 -0700 Subject: [PATCH] Merge from CVS HEAD: 1.34.10.22 --- framework/Mime/lib/Horde/Mime/Viewer/vcard.php | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/framework/Mime/lib/Horde/Mime/Viewer/vcard.php b/framework/Mime/lib/Horde/Mime/Viewer/vcard.php index 1b2837ed0..d7e3956e7 100644 --- 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)); } -- 2.11.0