From 740875e5cd55581f146fd1fbd2c4d4b904775832 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 13 Jun 2012 11:42:12 +0200 Subject: Add skin name to the (javascript) environment --- program/include/rcube_config.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'program/include/rcube_config.php') 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'; -- cgit v1.2.3