From 8bed5e0151eb375e2d2dc91e4e6c6d5aa62daa5c Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 19 Jul 2015 05:06:48 -0400
Subject: [PATCH] Fix regression where compose editor mode was set incorrectly

---
 program/steps/settings/save_folder.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc
index b8fc490..e983a2f 100644
--- a/program/steps/settings/save_folder.inc
+++ b/program/steps/settings/save_folder.inc
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  +-----------------------------------------------------------------------+
  | program/steps/settings/save_folder.inc                                |
  |                                                                       |
@@ -68,7 +68,9 @@
 }
 
 // Check access rights to the parent folder
-if (!$error && strlen($path) && (!strlen($old_imap) || $old_imap != $name_imap)) {
+if (!$error && strlen($path) && (!strlen($old_imap) || $old_imap != $name_imap)
+    && $STORAGE->get_capability('ACL')
+) {
     $parent_opts = $STORAGE->folder_info($path);
     if ($parent_opts['namespace'] != 'personal'
         && (empty($parent_opts['rights']) || !preg_match('/[ck]/', implode($parent_opts['rights'])))

--
Gitblit v1.9.1