From 46d0012e26d18b1a780ff71cd8aa2f04e6c4a11b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 29 Aug 2012 08:32:06 +0200
Subject: Fix quota capability detection so it can be overwritten by a plugin
 (#1488655)

---
 program/steps/settings/folders.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'program/steps/settings')

diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 2c2cbdcc2..6ca704998 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -411,8 +411,10 @@ function rcmail_rename_folder($oldname, $newname)
 
 $OUTPUT->set_pagetitle(rcube_label('folders'));
 $OUTPUT->include_script('list.js');
-$OUTPUT->set_env('quota', $STORAGE->get_capability('QUOTA'));
 $OUTPUT->set_env('prefix_ns', $STORAGE->get_namespace('prefix'));
+if ($STORAGE->get_capability('QUOTA')) {
+    $OUTPUT->set_env('quota', true);
+}
 
 // add some labels to client
 $OUTPUT->add_label('deletefolderconfirm', 'purgefolderconfirm', 'folderdeleting',
-- 
cgit v1.2.3


From 26fc0defe374734db81baa8177466639ed65c900 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 3 Sep 2012 19:56:59 +0200
Subject: Fix bug where parentnotwritable error wasn't displayed in the
 interface

---
 program/steps/settings/save_folder.inc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'program/steps/settings')

diff --git a/program/steps/settings/save_folder.inc b/program/steps/settings/save_folder.inc
index 09f76ac27..73cc5e4bf 100644
--- a/program/steps/settings/save_folder.inc
+++ b/program/steps/settings/save_folder.inc
@@ -80,7 +80,10 @@ if (!$error && strlen($path) && (!strlen($old_imap) || $old_imap != $name_imap))
     }
 }
 
-if (!$error) {
+if ($error) {
+    $OUTPUT->command('display_message', $error, 'error');
+}
+else {
     $folder['name']     = $name_imap;
     $folder['oldname']  = $old_imap;
     $folder['class']    = '';
-- 
cgit v1.2.3