Permalink
Browse files

Fix so subscribed non-existing/non-accessible shared folder can be un…

…subscribed

Conflicts:

	CHANGELOG
  • Loading branch information...
1 parent da0c480 commit c2c162c240da9d3cb6a9b5644aff30cd6822b7fb @alecpl alecpl committed Aug 21, 2012
Showing with 6 additions and 2 deletions.
  1. +4 −0 CHANGELOG
  2. +2 −2 program/steps/settings/folders.inc
View
@@ -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)
@@ -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) {

0 comments on commit c2c162c

Please sign in to comment.