From 473dc0b86d6e1790945d48d6d5161b04e14575b8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 02 Apr 2016 03:11:21 -0400
Subject: [PATCH] Fix so SPECIAL-USE assignments are forced only until user sets special folders (#4782)

---
 program/steps/settings/save_prefs.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 4ecaa70..7528fa8 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -123,6 +123,8 @@
 case 'folders':
     $a_user_prefs = array(
         'show_real_foldernames' => isset($_POST['_show_real_foldernames']) ? true : false,
+        // stop using SPECIAL-USE (#4782)
+        'lock_special_folders'  => !in_array('lock_special_folders', (array) $CONFIG['dont_override']),
     );
 
     foreach (rcube_storage::$folder_types as $type) {

--
Gitblit v1.9.1