Fix bug where vacation rule was saved to wrong script if managesieve_kolab_master=true

pull/264/head
Aleksander Machniak 10 years ago
parent 6af79f1517
commit 501cdd651e

@ -1,5 +1,6 @@
- Fix bug where actions without if/elseif/else in sieve scripts were skipped
- Support "not allof" test as a negation of all sub-tests
- Fix bug where vacation rule was saved to wrong script if managesieve_kolab_master=true
* version 8.1 [2014-12-09]
-----------------------------------------------------------

@ -227,7 +227,7 @@ class rcube_sieve_engine
if ($script_name === null || $script_name === '') {
// get (first) active script
if (!empty($this->active[0])) {
if (!empty($this->active)) {
$script_name = $this->active[0];
}
else if ($list) {
@ -2078,7 +2078,6 @@ class rcube_sieve_engine
// Handle active script(s) and list of scripts according to Kolab's KEP:14
if ($this->rc->config->get('managesieve_kolab_master')) {
// Skip protected names
foreach ((array)$this->list as $idx => $name) {
$_name = strtoupper($name);
@ -2140,6 +2139,11 @@ class rcube_sieve_engine
}
}
// reindex
if (!empty($this->list)) {
$this->list = array_values($this->list);
}
return $this->list;
}

Loading…
Cancel
Save