From 30f50556c130e272d9eb6ddcd11ea70a18a4e711 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 17 Sep 2011 12:46:31 -0400
Subject: [PATCH] - Fix locked folder rename option on servers supporting RFC2086 only (#1488089)
---
CHANGELOG | 1 +
program/include/rcube_imap.php | 3 ++-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 1d8b0b3..22d2d81 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix locked folder rename option on servers supporting RFC2086 only (#1488089)
- Trigger 'new_messages' hook for all checked folders (#1488083)
- Fix session race conditions when composing new messages
- Fix encoding of LDAP contacts identifiers (#1488079)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 8c90456..d9549af 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -3500,7 +3500,8 @@
}
if (!empty($options['rights'])) {
- $options['norename'] = !in_array('x', $options['rights']);
+ $options['norename'] = !in_array('x', $options['rights']) && !in_array('d', $options['rights']);
+
if (!$options['noselect']) {
$options['noselect'] = !in_array('r', $options['rights']);
}
--
Gitblit v1.9.1