summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-20 08:45:44 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-20 08:45:44 +0200
commita696e86c80eb84c53e4362412e32ede5039e73a1 (patch)
tree2b3bd37d5e47babaff3ed4790e7ac556fba45c54 /plugins
parentc83b83eeae9806cb60ea3f41f2cff055b0c6ed7e (diff)
parentb2631bffd98a51fc8b61aa8452fbaf3e95bcde24 (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'plugins')
-rw-r--r--plugins/hide_blockquote/hide_blockquote.php6
-rw-r--r--plugins/hide_blockquote/skins/larry/style.css (renamed from plugins/hide_blockquote/skins/default/style.css)0
2 files changed, 1 insertions, 5 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