From f26f73a1a3e55095099958a3647b0e1b4f665d0b Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Sat, 18 Aug 2012 18:01:00 +0200 Subject: More default->larry fixes Conflicts: program/include/rcube_plugin.php --- program/include/rcube_plugin.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'program/include') diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php index 0b872cf95..e7115cbec 100644 --- a/program/include/rcube_plugin.php +++ b/program/include/rcube_plugin.php @@ -17,9 +17,6 @@ +-----------------------------------------------------------------------+ | Author: Thomas Bruederli | +-----------------------------------------------------------------------+ - - $Id$ - */ /** @@ -337,9 +334,13 @@ abstract class rcube_plugin */ 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; } -- cgit v1.2.3