diff options
| author | Aleksander Machniak <alec@alec.pl> | 2012-08-21 11:22:23 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2012-08-21 11:22:23 +0200 |
| commit | 9cb76ad3c2ebcf6f75053de2e686390470dce7ba (patch) | |
| tree | 86ec5eeafc9141d12d9ca11849dfccbad887f805 | |
| parent | fe2f0be4352ba0bc213a2c6d4dfcbbddea1a551c (diff) | |
Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/settings/folders.inc | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed - Rewritten test scripts for PHPUnit - Add new DB abstraction layer based on PHP PDO, supporting SQLite3 (#1488332) - Removed PEAR::MDB2 package diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc index 1031fc136..2c2cbdcc2 100644 --- a/program/steps/settings/folders.inc +++ b/program/steps/settings/folders.inc @@ -321,8 +321,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) { |