Merge branch 'master' of https://github.com/roundcube/roundcubemail

1 files changed, 3 insertions, 3 deletions

diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve.php b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
index 16c584b7d..a04e3c2a4 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve.php
@@ -84,7 +84,7 @@ class rcube_sieve
             return $this->_set_error(SIEVE_ERROR_LOGIN);
         }
 
-        $this->exts     = $this->get_extensions();
+        $this->exts = $this->get_extensions();
 
         // disable features by config
         if (!empty($disabled)) {
@@ -325,7 +325,7 @@ class rcube_sieve
                         continue 2;
                     }
                 }
-                if (empty($script->content[$idx+1]) || $script->content[$idx+1]['type'] != 'if') {
+                if (!empty($script->content[$idx+1]) && $script->content[$idx+1]['type'] != 'if') {
                     $script->content[$idx]['actions'][] = array('type' => 'stop');
                 }
             }
@@ -379,6 +379,6 @@ class rcube_sieve
      */
     public function debug_handler(&$sieve, $message)
     {
-        write_log('sieve', preg_replace('/\r\n$/', '', $message));
+        rcube::write_log('sieve', preg_replace('/\r\n$/', '', $message));
     }
 }