From 51d1a02cad1615e11f519aaf3cd5394ec262f9e9 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 21 Aug 2012 11:24:19 +0200 Subject: Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed Conflicts: CHANGELOG --- CHANGELOG | 4 ++++ program/steps/settings/folders.inc | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 5a5c3cdd8..35819e235 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG Roundcube Webmail =========================== +- Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed + +RELEASE 0.8.1 +------------- - Fix bug where domain name was converted to lower-case even with login_lc=false (#1488593) - Fix lower-casing email address on replies (#1488598) - Fix line separator in exported messages (#1488603) diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 3802577eb..2d3a2c3c5 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -324,8 +324,8 @@ function rcube_subscription_form($attrib) } } } - // check if the folder is shared, then disable subscription option on it - if (!$disabled && $folder['virtual'] && !empty($namespace)) { + // check if the folder is shared, then disable subscription option on it (if not subscribed already) + if (!$disabled && !$subscribed && $folder['virtual'] && !empty($namespace)) { $tmp_ns = array_merge((array)$namespace['other'], (array)$namespace['shared']); foreach ($tmp_ns as $item) { if (strpos($folder['id'], $item[0]) === 0) { -- cgit v1.2.3