- Fix saving of a script using flags extension on servers with imap4flags support (#1487825)

git-svn-id: https://svn.roundcube.net/trunk@4596 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 2 insertions, 5 deletions

diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 1b44562f8..0ec435d81 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -534,9 +534,6 @@ class managesieve extends rcube_plugin
                         }
                     }
                     $this->form['actions'][$i]['target'] = $_target;
-                    if (in_array('imap4flags', $this->exts)) {
-                        $this->form['actions'][$i]['mode'] = 'imap4flags';
-                    }
                     break;
 
                 case 'vacation':
@@ -1085,9 +1082,9 @@ class managesieve extends rcube_plugin
             . (preg_match('/^(set|add|remove)flag$/', $action['type']) ? 'inline' : 'none') . '"'
             . $this->error_class($id, 'action', 'flags', 'action_flags') . '>';
         foreach ($flags as $fidx => $flag) {
-            $out .= '<nobr><input type="checkbox" name="_action_flags[' .$id .'][]" value="' . $flag . '"'
+            $out .= '<input type="checkbox" name="_action_flags[' .$id .'][]" value="' . $flag . '"'
                 . (in_array_nocase($flag, $flags_target) ? 'checked="checked"' : '') . ' />'
-                . Q($this->gettext('flag'.$fidx)) .'</nobr> ';
+                . Q($this->gettext('flag'.$fidx)) .'<br>';
         }
         $out .= '</div>';