From 4230651565e386662a6931396c3d4a6b33b4f30d Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 18 Jun 2008 03:13:04 -0400
Subject: [PATCH] Add fallback to old 'skin_path' property + indent with spaces instead of tabs
---
program/include/rcube_config.php | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 0ffb0d3..14316b8 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -60,9 +60,15 @@
// load host-specific configuration
$this->load_host_config();
+ // set skin (with fallback to old 'skin_path' property)
+ 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';
+
// fix paths
- $this->prop['skin'] = $this->prop['skin'] ? unslashify($this->prop['skin']) : 'default';
$this->prop['log_dir'] = $this->prop['log_dir'] ? unslashify($this->prop['log_dir']) : INSTALL_PATH . 'logs';
+ $this->prop['temp_dir'] = $this->prop['temp_dir'] ? unslashify($this->prop['temp_dir']) : INSTALL_PATH . 'temp';
// handle aliases
if (isset($this->prop['locale_string']) && empty($this->prop['language']))
--
Gitblit v1.9.1