summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-08-09 21:56:00 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-08-09 22:00:38 +0200
commit68b9f365b38fe68848eedf81a9eaad7810f51b0b (patch)
tree012925c40874b5a8561a441702dc986341bb42d2 /program/include
parentcf8bac1c65b0a1a9b86d4c4430710eb04919da70 (diff)
Replace some forgotten references to skins/default (#1488591)
Conflicts: program/include/rcube_config.php program/include/rcube_template.php
Diffstat (limited to 'program/include')
-rw-r--r--program/include/rcube_config.php10
-rw-r--r--program/include/rcube_template.php2
2 files changed, 8 insertions, 4 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php
index 3788f121a..826c70016 100644
--- a/program/include/rcube_config.php
+++ b/program/include/rcube_config.php
@@ -29,6 +29,8 @@
*/
class rcube_config
{
+ const DEFAULT_SKIN = 'larry';
+
private $prop = array();
private $errors = array();
private $userprefs = array();
@@ -74,14 +76,15 @@ class rcube_config
$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'] = 'larry';
+ $this->prop['skin'] = self::DEFAULT_SKIN;
// larry is the new default skin :-)
if ($this->prop['skin'] == 'default')
- $this->prop['skin'] = 'larry';
+ $this->prop['skin'] = self::DEFAULT_SKIN;
// fix paths
$this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs';
@@ -251,8 +254,9 @@ class rcube_config
}
// larry is the new default skin :-)
+
if ($prefs['skin'] == 'default')
- $prefs['skin'] = 'larry';
+ $prefs['skin'] = self::DEFAULT_SKIN;
$this->userprefs = $prefs;
$this->prop = array_merge($this->prop, $prefs);
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php
index 24915f093..8efb5c9da 100644
--- a/program/include/rcube_template.php
+++ b/program/include/rcube_template.php
@@ -158,7 +158,7 @@ class rcube_template extends rcube_html_page
$valid = true;
}
else {
- $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default';
+ $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : rcube_config::DEFAULT_SKIN;
$valid = !$skin;
}