From 9f1652e29e2ed8be815cae4abf42bde989ffeb22 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 30 Jul 2012 12:04:43 +0200
Subject: Adapt to new default skin folder namimg

---
 program/include/rcube_plugin.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'program/include/rcube_plugin.php')

diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php
index b91355c98..b1ec32a8a 100644
--- a/program/include/rcube_plugin.php
+++ b/program/include/rcube_plugin.php
@@ -336,9 +336,12 @@ abstract class rcube_plugin
   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'),'default') as $skin) {
+      $skin_path = 'skins/' . $skin;
+      if (is_dir(realpath(slashify($this->home) . $skin_path)))
+        break;
+    }
+
     return $skin_path;
   }
 
-- 
cgit v1.2.3