From 3185f3a52404baacaef29e4ace534c97e5ddc931 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Mon, 30 Jul 2012 08:26:41 -0400
Subject: [PATCH] Backported default -> classic skin renaming
---
program/include/rcube_config.php | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 46906dd..3788f12 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -77,7 +77,11 @@
if (empty($this->prop['skin']) && !empty($this->prop['skin_path']))
$this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path']));
else if (empty($this->prop['skin']))
- $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';
@@ -236,10 +240,8 @@
// 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]);
}
}
@@ -248,6 +250,10 @@
$prefs['timezone'] = timezone_name_from_abbr('', $prefs['timezone'] * 3600, 0);
}
+ // larry is the new default skin :-)
+ if ($prefs['skin'] == 'default')
+ $prefs['skin'] = 'larry';
+
$this->userprefs = $prefs;
$this->prop = array_merge($this->prop, $prefs);
--
Gitblit v1.9.1