diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_config.php | 16 | ||||
| -rw-r--r-- | program/include/rcube_template.php | 2 |
2 files changed, 12 insertions, 6 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php index 46906dde1..3788f121a 100644 --- a/program/include/rcube_config.php +++ b/program/include/rcube_config.php @@ -77,7 +77,11 @@ class rcube_config 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 @@ class rcube_config // 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 @@ class rcube_config $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); diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php index 19510ce5b..24915f093 100644 --- a/program/include/rcube_template.php +++ b/program/include/rcube_template.php @@ -77,7 +77,7 @@ class rcube_template extends rcube_html_page $this->set_env('x_frame_options', $this->app->config->get('x_frame_options', 'sameorigin')); // load the correct skin (in case user-defined) - $skin = $this->app->config->get('skin', 'default'); + $skin = $this->app->config->get('skin'); $this->set_skin($skin); $this->set_env('skin', $skin); |