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_config.php | 12 +++++++-----
 program/include/rcube_plugin.php |  9 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

(limited to 'program')

diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 9db746fe8..a0e914b78 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -81,10 +81,14 @@ class rcube_config
                 $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
             }
             else {
-                $this->prop['skin'] = 'default';
+                $this->prop['skin'] = 'larry';
             }
         }
 
+        // larry is the new default skin :-)
+        if ($this->prop['skin'] == 'default')
+            $this->prop['skin'] = 'larry';
+
         // fix paths
         $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
         $this->prop['temp_dir'] = $this->prop['temp_dir'] ? realpath(unslashify($this->prop['temp_dir'])) : INSTALL_PATH . 'temp';
@@ -238,10 +242,8 @@ class rcube_config
         // Honor the dont_override setting for any existing user preferences
         $dont_override = $this->get('dont_override');
         if (is_array($dont_override) && !empty($dont_override)) {
-            foreach ($prefs as $key => $pref) {
-                if (in_array($key, $dont_override)) {
-                    unset($prefs[$key]);
-                }
+            foreach ($dont_override as $key) {
+                unset($prefs[$key]);
             }
         }
 
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