From b2631bffd98a51fc8b61aa8452fbaf3e95bcde24 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 18 Aug 2012 11:57:08 -0400
Subject: [PATCH] More default->larry fixes
---
program/include/rcube_plugin.php | 2 +-
plugins/hide_blockquote/hide_blockquote.php | 6 +-----
plugins/hide_blockquote/skins/larry/style.css | 0
3 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/plugins/hide_blockquote/hide_blockquote.php b/plugins/hide_blockquote/hide_blockquote.php
index ca0273a..7af163d 100644
--- a/plugins/hide_blockquote/hide_blockquote.php
+++ b/plugins/hide_blockquote/hide_blockquote.php
@@ -27,11 +27,7 @@
&& ($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
similarity index 100%
rename from plugins/hide_blockquote/skins/default/style.css
rename to plugins/hide_blockquote/skins/larry/style.css
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index b1ec32a..c103573 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -336,7 +336,7 @@
public function local_skin_path()
{
$rcmail = rcube::get_instance();
- foreach (array($rcmail->config->get('skin'),'default') as $skin) {
+ foreach (array($rcmail->config->get('skin'), 'larry') as $skin) {
$skin_path = 'skins/' . $skin;
if (is_dir(realpath(slashify($this->home) . $skin_path)))
break;
--
Gitblit v1.9.1