Fix PHP error in Preferences when default_folders was in dont_override (#1489940)

1 files changed, 4 insertions, 11 deletions

diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index f71eee39a..fba2b351f 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -192,17 +192,10 @@ case 'addressbook':
 
 case 'folders':
     // 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_folders'] = array('INBOX');
-        foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
-            if ($a_user_prefs[$p]) {
-                $a_user_prefs['default_folders'][] = $a_user_prefs[$p];
-            }
+    $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_folders'][] = $a_user_prefs[$p];
         }
     }