From c321a955a7b0f6d6b13ffaebf040a6c7091037ae Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 16 Jan 2012 10:14:41 -0500
Subject: [PATCH] Merged devel-framework branch (r5746:5779) back into trunk
---
program/include/rcube_config.php | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 0383364..6ccf69b 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -72,9 +72,9 @@
foreach (array('drafts_mbox', 'junk_mbox', 'sent_mbox', 'trash_mbox') as $folder)
$this->prop[$folder] = rcube_charset_convert($this->prop[$folder], RCMAIL_CHARSET, 'UTF7-IMAP');
- if (!empty($this->prop['default_imap_folders']))
- foreach ($this->prop['default_imap_folders'] as $n => $folder)
- $this->prop['default_imap_folders'][$n] = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
+ if (!empty($this->prop['default_folders']))
+ foreach ($this->prop['default_folders'] as $n => $folder)
+ $this->prop['default_folders'][$n] = rcube_charset_convert($folder, RCMAIL_CHARSET, 'UTF7-IMAP');
// set PHP error logging according to config
if ($this->prop['debug_level'] & 1) {
--
Gitblit v1.9.1