More default->larry fixes

Conflicts:

	program/include/rcube_plugin.php

3 files changed, 8 insertions, 11 deletions

diff --git a/plugins/hide_blockquote/hide_blockquote.php b/plugins/hide_blockquote/hide_blockquote.php
index ca0273a5d..7af163dcd 100644
--- a/plugins/hide_blockquote/hide_blockquote.php
+++ b/plugins/hide_blockquote/hide_blockquote.php
@@ -27,11 +27,7 @@ class hide_blockquote extends rcube_plugin
             && ($limit = $rcmail->config->get('hide_blockquote_limit'))
         ) {
             // include styles
-            $skin = $rcmail->config->get('skin');
-            if (!file_exists($this->home."/skins/$skin/style.css")) {
-                $skin = 'default';
-            }
-            $this->include_stylesheet("skins/$skin/style.css");
+            $this->include_stylesheet($this->local_skin_path() . "/style.css");
 
             // Script and localization
             $this->include_script('hide_blockquote.js');
diff --git a/plugins/hide_blockquote/skins/default/style.css b/plugins/hide_blockquote/skins/larry/style.css
index 198172f92..198172f92 100644
--- a/plugins/hide_blockquote/skins/default/style.css
+++ b/plugins/hide_blockquote/skins/larry/style.css
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index 0b872cf95..e7115cbec 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -17,9 +17,6 @@
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
-
- $Id$
-
 */
 
 /**
@@ -337,9 +334,13 @@ abstract class rcube_plugin
    */
   public function local_skin_path()
   {
-      $skin_path = 'skins/'.$this->api->config->get('skin');
-      if (!is_dir(realpath(slashify($this->home) . $skin_path)))
-        $skin_path = 'skins/default';
+    $rcmail = rcmail::get_instance();
+    foreach (array($rcmail->config->get('skin'), 'larry') as $skin) {
+      $skin_path = 'skins/' . $skin;
+      if (is_dir(realpath(slashify($this->home) . $skin_path)))
+        break;
+    }
+
     return $skin_path;
   }