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

Conflicts:
	plugins/password/config.inc.php.dist

1 files changed, 11 insertions, 6 deletions

diff --git a/plugins/managesieve/managesieve.php b/plugins/managesieve/managesieve.php
index 6adba4e2d..478f26b00 100644
--- a/plugins/managesieve/managesieve.php
+++ b/plugins/managesieve/managesieve.php
@@ -37,7 +37,7 @@ class managesieve extends rcube_plugin
 
     function init()
     {
-        $this->rc = rcmail::get_instance();
+        $this->rc = rcube::get_instance();
 
         // register actions
         $this->register_action('plugin.managesieve', array($this, 'managesieve_actions'));
@@ -54,7 +54,9 @@ class managesieve extends rcube_plugin
             $this->add_hook('message_headers_output', array($this, 'mail_headers'));
 
             // inject Create Filter popup stuff
-            if (empty($this->rc->action) || $this->rc->action == 'show') {
+            if (empty($this->rc->action) || $this->rc->action == 'show'
+                || strpos($this->rc->action, 'plugin.managesieve') === 0
+            ) {
                 $this->mail_task_handler();
             }
         }
@@ -72,13 +74,15 @@ class managesieve extends rcube_plugin
         // load localization
         $this->add_texts('localization/');
 
-        if ($this->rc->task == 'mail' || strpos($this->rc->action, 'plugin.managesieve') === 0) {
+        $sieve_action = strpos($this->rc->action, 'plugin.managesieve') === 0;
+
+        if ($this->rc->task == 'mail' || $sieve_action) {
             $this->include_script('managesieve.js');
         }
 
         // include styles
         $skin_path = $this->local_skin_path();
-        if ($this->rc->task == 'settings') {
+        if ($this->rc->task == 'settings' || $sieve_action) {
             if (is_file($this->home . "/$skin_path/managesieve.css")) {
                 $this->include_stylesheet("$skin_path/managesieve.css");
             }
@@ -89,7 +93,6 @@ class managesieve extends rcube_plugin
             }
         }
 
-
         $this->ui_initialized = true;
     }
 
@@ -109,6 +112,7 @@ class managesieve extends rcube_plugin
                 'class'  => 'filter',
                 'label'  => 'filters',
                 'domain' => 'managesieve',
+                'title'  => 'filterstitle',
             );
         }
 
@@ -119,6 +123,7 @@ class managesieve extends rcube_plugin
                 'class'  => 'vacation',
                 'label'  => 'vacation',
                 'domain' => 'managesieve',
+                'title'  => 'vacationtitle',
             );
         }
 
@@ -225,7 +230,7 @@ class managesieve extends rcube_plugin
     /**
      * Initializes engine object
      */
-    private function get_engine($type = null)
+    public function get_engine($type = null)
     {
         if (!$this->engine) {
             $this->load_config();