Managesieve: Fix current script state after initial scripts creation …

…in managesieve_kolab_master mode
roundcube · Sep 25, 2024 · a4e50e3 · a4e50e3
1 parent 9bf6ee3
commit a4e50e3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -62,6 +62,7 @@
 - Fix potential HTTP protocol version mismatch (#8982)
 - Fix PHP warnings (#9616, #9611)
 - Fix whitespace handling in vCard line continuation (#9637)
+- Fix current script state after initial scripts creation in managesieve_kolab_master mode
 
 ## Release 1.6.9
 

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
@@ -3,6 +3,7 @@
 - Support an array in managesieve_host option (#9447)
 - Protect special scripts in managesieve_kolab_master mode
 - Fix infinite loop when parsing a malformed script (#9562)
+- Fix current script state after initial scripts creation in managesieve_kolab_master mode
 
 * version 9.5 [2023-03-26]
 -----------------------------------------------------------

diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -266,11 +266,11 @@ protected function load_script($script_name = null)
             // get (first) active script
             if (!empty($this->active)) {
                 $script_name = $this->active[0];
-            } elseif ($list) {
+            } elseif (!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();
             }
         }