From 92eb18b46ac9dee2349bcb76b8fc5fea5dc8954f Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Fri, 09 Nov 2012 05:53:29 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/include/rcube_plugin.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index b91355c..4508885 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -202,7 +202,7 @@
foreach ($texts as $key => $value)
$add[$domain.'.'.$key] = $value;
- $rcmail = rcmail::get_instance();
+ $rcmail = rcube::get_instance();
$rcmail->load_language($lang, $add);
// add labels to client
@@ -336,9 +336,12 @@
public function local_skin_path()
{
$rcmail = rcube::get_instance();
- $skin_path = 'skins/' . $rcmail->config->get('skin');
- if (!is_dir(realpath(slashify($this->home) . $skin_path)))
- $skin_path = 'skins/default';
+ 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;
}
--
Gitblit v1.9.1