From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 28 Jan 2010 20:56:35 +0000 (-0700)
Subject: Fix logic for when to use mailbox abbreviations
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e98f6cf90d6ce442ad46afcad7903db46b363d13;p=horde.git

Fix logic for when to use mailbox abbreviations
---

diff --git a/imp/lib/IMP.php b/imp/lib/IMP.php
index 678c7a799..4e2a8667c 100644
--- a/imp/lib/IMP.php
+++ b/imp/lib/IMP.php
@@ -181,7 +181,7 @@ class IMP
 
             $val = isset($filter[$mbox['val']]) ? '' : htmlspecialchars($mbox['val']);
             $sel = ($mbox['val'] && !empty($options['selected']) && ($mbox['val'] === $options['selected'])) ? ' selected="selected"' : '';
-            $label = empty($options['abbrev']) ? $mbox['label'] : $mbox['abbrev'];
+            $label = (isset($options['abbrev']) && !$options['abbrev']) ? $mbox['label'] : $mbox['abbrev'];
             $text .= sprintf('<option value="%s"%s>%s</option>%s', $val, $sel, Horde_Text_Filter::filter($label, 'space2html', array('charset' => Horde_Nls::getCharset(), 'encode' => true)), "\n");
         }