summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
Diffstat (limited to 'program')
-rw-r--r--program/include/rcube_config.php2
-rwxr-xr-xprogram/include/rcube_template.php2
-rw-r--r--program/steps/settings/save_prefs.inc2
3 files changed, 3 insertions, 3 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index b862bf769..0ffb0d3fa 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -61,7 +61,7 @@ class rcube_config
$this->load_host_config();
// fix paths
- $this->prop['default_skin'] = $this->prop['default_skin'] ? unslashify($this->prop['default_skin']) : 'default';
+ $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';
// handle aliases
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 9bc918e9a..6cf9a9ad4 100755
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -59,7 +59,7 @@ class rcube_template extends rcube_html_page
// load the correct skin (in case user-defined)
if (empty($this->config['skin']) || !is_readable('skins/'.$this->config['skin']))
- $this->config['skin'] = $this->config['default_skin'];
+ $this->config['skin'] = 'default';
$this->config['skin_path'] = 'skins/'.$this->config['skin'];
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 6a0498b93..750b33bf0 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -35,7 +35,7 @@ $a_user_prefs = array(
'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
- 'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['default_skin'],
+ 'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
);
// don't override these parameters