diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-21 11:24:19 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-21 11:24:19 +0200 |
| commit | 51d1a02cad1615e11f519aaf3cd5394ec262f9e9 (patch) | |
| tree | 0774a6e225804b64dda76ba8aa5e11a2da2b63fc | |
| parent | f26f73a1a3e55095099958a3647b0e1b4f665d0b (diff) | |
Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | program/steps/settings/folders.inc | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -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) { |