diff options
| -rw-r--r-- | program/include/rcube_config.php | 12 | ||||
| -rw-r--r-- | program/include/rcube_output_html.php | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/program/include/rcube_config.php b/program/include/rcube_config.php index 34c61c58d..1b621e0fc 100644 --- a/program/include/rcube_config.php +++ b/program/include/rcube_config.php @@ -71,10 +71,14 @@ 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'] = 'default'; + if (empty($this->prop['skin'])) { + if (!empty($this->prop['skin_path'])) { + $this->prop['skin'] = str_replace('skins/', '', unslashify($this->prop['skin_path'])); + } + else { + $this->prop['skin'] = 'default'; + } + } // fix paths $this->prop['log_dir'] = $this->prop['log_dir'] ? realpath(unslashify($this->prop['log_dir'])) : INSTALL_PATH . 'logs'; diff --git a/program/include/rcube_output_html.php b/program/include/rcube_output_html.php index fce9615cf..7ceea1839 100644 --- a/program/include/rcube_output_html.php +++ b/program/include/rcube_output_html.php @@ -68,7 +68,9 @@ class rcube_output_html extends rcube_output $this->set_env('x_frame_options', $this->config->get('x_frame_options', 'sameorigin')); // load the correct skin (in case user-defined) - $this->set_skin($this->config->get('skin')); + $skin = $this->config->get('skin'); + $this->set_skin($skin); + $this->set_env('skin', $skin); // add common javascripts $this->add_script('var '.rcmail::JS_OBJECT_NAME.' = new rcube_webmail();', 'head_top'); |