- actually we don't need default_skin option

git-svn-id: https://svn.roundcube.net/trunk@1542 208e9e7b-5314-0410-a742-e7e81cd9613c

2 files changed, 2 insertions, 2 deletions

diff --git a/roundcubemail/program/include/rcube_config.php b/roundcubemail/program/include/rcube_config.php
index b862bf769..0ffb0d3fa 100644
--- a/roundcubemail/program/include/rcube_config.php
+++ b/roundcubemail/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/roundcubemail/program/include/rcube_template.php b/roundcubemail/program/include/rcube_template.php
index 9bc918e9a..6cf9a9ad4 100755
--- a/roundcubemail/program/include/rcube_template.php
+++ b/roundcubemail/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'];