summaryrefslogtreecommitdiff
path: root/installer/rcube_install.php
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2012-01-16 15:14:41 +0000
committerthomascube <thomas@roundcube.net>2012-01-16 15:14:41 +0000
commitc321a955a7b0f6d6b13ffaebf040a6c7091037ae (patch)
tree60c257d29a726d9bdda7fb75a198342aaef315fa /installer/rcube_install.php
parent8764b6ecf0c8d1b0646915a8139cdf6bbac2ca14 (diff)
Merged devel-framework branch (r5746:5779) back into trunk
Diffstat (limited to 'installer/rcube_install.php')
-rw-r--r--installer/rcube_install.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index cc946eca0..2e1a473ca 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -41,6 +41,7 @@ class rcube_install
'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 @@ class rcube_install
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;