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

plugins/enigma/enigma.php

@@ -435,7 +435,7 @@ class enigma extends rcube_plugin
                     'href' => "#",
                     'onclick' => "return ".JS_OBJECT_NAME.".enigma_import_attachment('".JQ($part)."')",
                     'title' => $this->gettext('keyattimport')),
-                    html::img(array('src' => $this->url('skins/default/key_add.png'), 'style' => "vertical-align:middle")))
+                    html::img(array('src' => $this->url('skins/classic/key_add.png'), 'style' => "vertical-align:middle")))
                 . ' ' . html::span(null, $this->gettext('keyattfound')));
 
             $attach_script = true;

plugins/help/help.php

@@ -42,12 +42,11 @@ class help extends rcube_plugin
             'label'      => 'help.help',
         ), 'taskbar');
 
-        $skin = $rcmail->config->get('skin');
+        // add style for taskbar button (must be here) and Help UI
-        if (!file_exists($this->home."/skins/$skin/help.css"))
+        $skin_path = $this->local_skin_path();
-            $skin = 'default';
+        if (is_file($this->home . "/$skin_path/help.css")) {
-
+            $this->include_stylesheet("$skin_path/help.css");
-        // add style for taskbar button (must be here) and Help UI    
+        }
-        $this->include_stylesheet("skins/$skin/help.css");
     }
 
     function action()

plugins/managesieve/managesieve.php

@@ -109,16 +109,16 @@ class managesieve extends rcube_plugin
     function mail_task_handler()
     {
         // use jQuery for popup window
-        $this->require_plugin('jqueryui'); 
+        $this->require_plugin('jqueryui');
 
         // include js script and localization
         $this->init_ui();
 
         // include styles
-        $skin = $this->rc->config->get('skin');
+        $skin_path = $this->local_skin_path();
-        if (!file_exists($this->home."/skins/$skin/managesieve_mail.css"))
+        if (is_file($this->home . "/$skin_path/managesieve_mail.css")) {
-            $skin = 'default';
+            $this->include_stylesheet("$skin_path/managesieve_mail.css");
-        $this->include_stylesheet("skins/$skin/managesieve_mail.css");
+        }
 
         // add 'Create filter' item to message menu
         $this->api->add_content(html::tag('li', null,