Fix wrong action folder selection if managesieve_domains is not empty (#1489617)

2 files changed, 7 insertions, 5 deletions

diff --git a/plugins/managesieve/Changelog b/plugins/managesieve/Changelog
index 3985e9bd2..974495acd 100644
--- a/plugins/managesieve/Changelog
+++ b/plugins/managesieve/Changelog
@@ -6,6 +6,7 @@
 - Fix issue where multi-select fields were not visible in new filter action rows (#1489600)
 - Fix issue in displaying filter form when managesieve_kolab_master=true
   and sieve variables extension is supported by the server (#1489599)
+- Fix wrong action folder selection if managesieve_domains is not empty (#1489617)
 
 * version 7.1 [2013-11-22]
 -----------------------------------------------------------
diff --git a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
index 4400a5b06..c366afac8 100644
--- a/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
+++ b/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
@@ -1642,11 +1642,12 @@ class rcube_sieve_engine
             $domain_select = new html_select(array('name' => "_action_target_domain[$id]", 'id' => 'action_target_domain'.$id));
             $domain_select->add(array_combine($domains, $domains));
 
-            $parts = explode('@', $action['target']);
-
-            if (!empty($parts)) {
-                $action['domain'] = array_pop($parts);
-                $action['target'] = implode('@', $parts);
+            if ($action['type'] == 'redirect') {
+                $parts = explode('@', $action['target']);
+                if (!empty($parts)) {
+                    $action['domain'] = array_pop($parts);
+                    $action['target'] = implode('@', $parts);
+                }
             }
         }