summaryrefslogtreecommitdiff
path: root/program/steps/settings
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-21 11:22:23 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-21 11:22:23 +0200
commit9cb76ad3c2ebcf6f75053de2e686390470dce7ba (patch)
tree86ec5eeafc9141d12d9ca11849dfccbad887f805 /program/steps/settings
parentfe2f0be4352ba0bc213a2c6d4dfcbbddea1a551c (diff)
Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed
Diffstat (limited to 'program/steps/settings')
-rw-r--r--program/steps/settings/folders.inc4
1 files changed, 2 insertions, 2 deletions
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) {