summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-21 11:24:19 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-21 11:24:19 +0200
commit51d1a02cad1615e11f519aaf3cd5394ec262f9e9 (patch)
tree0774a6e225804b64dda76ba8aa5e11a2da2b63fc /program
parentf26f73a1a3e55095099958a3647b0e1b4f665d0b (diff)
Fix so subscribed non-existing/non-accessible shared folder can be unsubscribed
Conflicts: CHANGELOG
Diffstat (limited to 'program')
-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 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) {