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
---
installer/rcube_install.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index cc946ec..2e1a473 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -41,6 +41,7 @@
'addrbook_show_images' => 'show_images',
'imap_root' => 'imap_ns_personal',
'pagesize' => 'mail_pagesize',
+ 'default_imap_folders' => 'default_folders',
);
// these config options are required for a working system
@@ -179,9 +180,9 @@
else if ($prop == 'smtp_pass' && !empty($_POST['_smtp_user_u'])) {
$value = '%p';
}
- else if ($prop == 'default_imap_folders') {
+ else if ($prop == 'default_folders') {
$value = array();
- foreach ($this->config['default_imap_folders'] as $_folder) {
+ foreach ($this->config['default_folders'] as $_folder) {
switch ($_folder) {
case 'Drafts': $_folder = $this->config['drafts_mbox']; break;
case 'Sent': $_folder = $this->config['sent_mbox']; break;
--
Gitblit v1.9.1