diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-21 11:22:23 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-24 18:29:06 +0200 |
| commit | c2c162c240da9d3cb6a9b5644aff30cd6822b7fb (patch) | |
| tree | 8f6df7863ceab9628afef70852913e9c799f5f45 | |
| parent | da0c480b9d4082717ee20a254c17c892799cfbc8 (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.7.3 +------------- - Fix quotation of message body when sending via SMTP - Added separate From and To columns apart from smart From/To column (#1486891) - Fix (workaround) delete operations with some versions of memcache (#1488592) diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 3fc366d1c..72c1976ac 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -316,8 +316,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) { |