Changeset f26f73a in github

Timestamp:

Aug 18, 2012 12:01:00 PM (10 months ago)

Author:

Aleksander Machniak <alec@…>

Children:

51d1a02

Parents:

408d141

Message:

More default->larry fixes

Conflicts:

program/include/rcube_plugin.php

Files:

• plugins/hide_blockquote/hide_blockquote.php (modified) (1 diff)
• plugins/hide_blockquote/skins/larry/style.css (moved) (moved from plugins/hide_blockquote/skins/default/style.css)
• program/include/rcube_plugin.php (modified) (2 diffs)

plugins/hide_blockquote/hide_blockquote.php

@@ -28 +28 @@
         ) {
             // 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

program/include/rcube_plugin.php

@@ -18 +18 @@
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
-
- $Id$
-
 */
 
@@ -338 +335 @@
   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;
   }