diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-16 15:14:41 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2012-01-16 15:14:41 +0000 |
| commit | 272c49b8ca54267634f94d7fdde7c2c2040df165 (patch) | |
| tree | 6e51092afa198a7fbc01b061cca99ad59f112d9d /roundcubemail/program/steps/settings/save_prefs.inc | |
| parent | cbd7d7b73b9571a4030961155f1fe0cbb0f1a3d3 (diff) | |
Merged devel-framework branch (r5746:5779) back into trunk
git-svn-id: https://svn.roundcube.net/trunk@5781 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/settings/save_prefs.inc')
| -rw-r--r-- | roundcubemail/program/steps/settings/save_prefs.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roundcubemail/program/steps/settings/save_prefs.inc b/roundcubemail/program/steps/settings/save_prefs.inc index 18ef5e7dd..ccb851bdd 100644 --- a/roundcubemail/program/steps/settings/save_prefs.inc +++ b/roundcubemail/program/steps/settings/save_prefs.inc @@ -181,15 +181,15 @@ switch ($CURR_SECTION) break; case 'folders': - // special handling for 'default_imap_folders' - if (in_array('default_imap_folders', (array)$CONFIG['dont_override'])) { + // special handling for 'default_folders' + if (in_array('default_folders', (array)$CONFIG['dont_override'])) { foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) $a_user_prefs[$p] = $CONFIG[$p]; } else { - $a_user_prefs['default_imap_folders'] = array('INBOX'); + $a_user_prefs['default_folders'] = array('INBOX'); foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) { if ($a_user_prefs[$p]) - $a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p]; + $a_user_prefs['default_folders'][] = $a_user_prefs[$p]; } } |