diff options
| -rw-r--r-- | plugins/managesieve/Changelog | 2 | ||||
| -rw-r--r-- | plugins/managesieve/lib/rcube_sieve.php | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog index ca7967092..d78d5b264 100644 --- a/plugins/managesieve/Changelog +++ b/plugins/managesieve/Changelog @@ -1,3 +1,5 @@ +- Fixed handling of error in Net_Sieve::listScripts() + * version 4.2 [2011-05-24] ----------------------------------------------------------- - Moved elsif replacement code to handle only imports from other formats diff --git a/plugins/managesieve/lib/rcube_sieve.php b/plugins/managesieve/lib/rcube_sieve.php index 932522d22..230b44bae 100644 --- a/plugins/managesieve/lib/rcube_sieve.php +++ b/plugins/managesieve/lib/rcube_sieve.php @@ -223,10 +223,12 @@ class rcube_sieve if (!$this->sieve) return $this->_set_error(SIEVE_ERROR_INTERNAL); - $this->list = $this->sieve->listScripts(); + $list = $this->sieve->listScripts(); - if (PEAR::isError($this->list)) + if (PEAR::isError($list)) return $this->_set_error(SIEVE_ERROR_OTHER); + + $this->list = $list; } return $this->list; |