From 5d61ba5314999731979fc5819b4f24c866c30baa Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 12 Jul 2010 19:18:12 -0600 Subject: [PATCH] Bug #9138: Use correct default value for Sent Mail mailbox --- imp/lib/Prefs/Ui.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/imp/lib/Prefs/Ui.php b/imp/lib/Prefs/Ui.php index 97830aa2e..f7ff0121b 100644 --- a/imp/lib/Prefs/Ui.php +++ b/imp/lib/Prefs/Ui.php @@ -1224,10 +1224,9 @@ class IMP_Prefs_Ui $sent_mail_folder = $ui->vars->sent_mail_folder; if (empty($sent_mail_folder)) { $sent_mail_new = $GLOBALS['injector']->getInstance('IMP_Imap')->getOb()->appendNamespace(Horde_String::convertCharset($ui->vars->sent_mail_folder_new, Horde_Nls::getCharset(), 'UTF7-IMAP')); - } elseif ($sent_mail_folder == '-1') { - if ($sent_mail_default = $prefs->getValue('sent_mail_folder')) { - $sent_mail_folder = $GLOBALS['injector']->getInstance('IMP_Imap')->getOb()->appendNamespace($sent_mail_default); - } + } elseif (($sent_mail_folder == '-1') && + ($sm_default = $prefs->getDefault('sent_mail_folder'))) { + $sent_mail_folder = $GLOBALS['injector']->getInstance('IMP_Imap')->getOb()->appendNamespace($sm_default); } if (empty($sent_mail_folder)) { -- 2.11.0