summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-18 17:57:08 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-18 17:57:08 +0200
commitb2631bffd98a51fc8b61aa8452fbaf3e95bcde24 (patch)
treea08ed220999f2b9a95e55bbb178747c92271b144
parent31541824ab156f225ede89028d3988688ce42a6e (diff)
More default->larry fixes
-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
-rw-r--r--program/include/rcube_plugin.php2
3 files changed, 2 insertions, 6 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 b1ec32a8a..c1035733b 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -336,7 +336,7 @@ abstract class rcube_plugin
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;