Managesieve: Fix current script state after initial scripts creation in managesieve_kolab_master mode

Author: alecpl

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+- Fix current script state after initial scripts creation in managesieve_kolab_master mode
+
+## Release 1.5.9
+
 - Fix regression where printing/scaling/rotating image attachments was broken (#9571)
 - Fix regression where HTML messages were displayed unstyled (#9586)
 

plugins/managesieve/Changelog

@@ -1,3 +1,5 @@
+- Fix current script state after initial scripts creation in managesieve_kolab_master mode
+
 * version 9.4 [2021-06-06]
 -----------------------------------------------------------
 - Add ability to remove 'redirect' option from UI (#7922)

plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php

@@ -248,14 +248,14 @@ protected function load_script($script_name = null)
         if ($script_name === null || $script_name === '') {
             // get (first) active script
             if (!empty($this->active)) {
-               $script_name = $this->active[0];
+                $script_name = $this->active[0];
             }
-            else if ($list) {
+            else if (!empty($list)) {
                 $script_name = $list[0];
             }
             else {
                 // if script does not exist create one with default content
-                $this->create_default_script();
+                $script_name = $this->create_default_script();
             }
         }