Bug #11783: Don't re-convert mailboxes already converted to UTF-8

horde · Nov 30, 2012 · 8e6cc32 · 8e6cc32
1 parent 84345bc
commit 8e6cc32
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/imp/lib/LoginTasks/SystemTask/Upgrade.php b/imp/lib/LoginTasks/SystemTask/Upgrade.php
@@ -524,16 +524,18 @@ protected function _upgradeMailboxPrefs()
 
         foreach ($special_mboxes as $val) {
             if (!$prefs->isDefault($val)) {
-                $old_pref = IMP_Mailbox::getPref($val);
-                $mbox = IMP_Mailbox::get(Horde_String::convertCharset(strval($old_pref), 'UTF7-IMAP', 'UTF-8'));
-                $prefs->setValue($val, $mbox->pref_to);
+                $old_pref = strval(IMP_Mailbox::getPref($val));
+                if (!Horde_Mime::is8bit($old_pref, 'UTF-8')) {
+                    $mbox = IMP_Mailbox::get(Horde_String::convertCharset($old_pref, 'UTF7-IMAP', 'UTF-8'));
+                    $prefs->setValue($val, $old_pref->$mbox->pref_to);
+                }
             }
         }
 
         $imp_identity = $injector->getInstance('IMP_Identity');
 
         foreach ($imp_identity->getAll('sent_mail_folder') as $key => $val) {
-            if (!is_null($val)) {
+            if (!is_null($val) && !Horde_Mime::is8bit($val, 'UTF-8')) {
                 $mbox = IMP_Mailbox::get(Horde_String::convertCharset(strval($val), 'UTF7-IMAP', 'UTF-8'));
                 $imp_identity->setValue('sent_mail_folder', $mbox, $key);
             }