diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-11-25 20:08:59 +0100 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-11-25 20:08:59 +0100 |
| commit | c72fbf06d6b08addbcc5dc234392b591c4239632 (patch) | |
| tree | da8e75afdaf65e4caf481a26554d03cf76e09f86 /plugins | |
| parent | bfc30700672fb40eb488259a70473f130d2f52ea (diff) | |
| parent | 8bfef1d7eba72de8b7895ba245931d4912a4cb73 (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/managesieve/Changelog | 1 | ||||
| -rw-r--r-- | plugins/managesieve/managesieve.js | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index 4b839a8b2..6baaa0499 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,5 +1,6 @@ - Fixed filter activation/deactivation confirmation message (#1488765) - Moved rcube_* classes to <plugin>/lib/Roundcube for compat. with Roundcube Framework autoloader +- Fixed filter selection after filter deletion (#1488832) * version 6.0 [2012-10-03] ----------------------------------------------------------- diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js index bbc10793c..6bf99ac26 100644 --- a/plugins/managesieve/managesieve.js +++ b/plugins/managesieve/managesieve.js @@ -373,7 +373,7 @@ rcube_webmail.prototype.load_managesieveframe = function(id) target = window.frames[this.env.contentframe]; var msgid = this.set_busy(true, 'loading'); target.location.href = this.env.comm_path+'&_action=plugin.managesieve&_framed=1' - +(id ? '&_fid='+id : '')+'&_unlock='+msgid; + +(has_id ? '&_fid='+id : '')+'&_unlock='+msgid; } }; |