Merged devel-framework branch (r5746:5779) back into trunk

git-svn-id: https://svn.roundcube.net/trunk@5781 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 3 insertions, 2 deletions

diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php
index cc946eca0..2e1a473ca 100644
--- a/roundcubemail/installer/rcube_install.php
+++ b/roundcubemail/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;