diff options
author | thomascube <thomas@roundcube.net> | 2008-06-18 07:13:04 +0000 |
---|---|---|
committer | thomascube <thomas@roundcube.net> | 2008-06-18 07:13:04 +0000 |
commit | 4230651565e386662a6931396c3d4a6b33b4f30d (patch) | |
tree | 70a2fbcc461ba19669b71217ba8adfd789268cc3 /program/include/rcube_template.php | |
parent | 1fb78c57ccd93c5fd58c2c42a82824dae738417c (diff) |
Add fallback to old 'skin_path' property + indent with spaces instead of tabs
Diffstat (limited to 'program/include/rcube_template.php')
-rwxr-xr-x | program/include/rcube_template.php | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php index 5bae3f790..53808bd2b 100755 --- a/program/include/rcube_template.php +++ b/program/include/rcube_template.php @@ -57,8 +57,8 @@ class rcube_template extends rcube_html_page //$this->framed = $framed; $this->set_env('task', $task); - // load the correct skin (in case user-defined) - $this->set_skin($this->config['skin']); + // load the correct skin (in case user-defined) + $this->set_skin($this->config['skin']); // add common javascripts $javascript = 'var '.JS_OBJECT_NAME.' = new rcube_webmail();'; @@ -110,13 +110,13 @@ class rcube_template extends rcube_html_page */ public function set_skin($skin) { - if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin)) - $skin_path = 'skins/'.$skin; - else - $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default'; - - $this->app->config->set('skin_path', $skin_path); - $this->config['skin_path'] = $skin_path; + if (!empty($skin) && is_dir('skins/'.$skin) && is_readable('skins/'.$skin)) + $skin_path = 'skins/'.$skin; + else + $skin_path = $this->config['skin_path'] ? $this->config['skin_path'] : 'skins/default'; + + $this->app->config->set('skin_path', $skin_path); + $this->config['skin_path'] = $skin_path; } /** @@ -127,9 +127,9 @@ class rcube_template extends rcube_html_page */ public function template_exists($name) { - $filename = $this->config['skin_path'] . '/templates/' . $name . '.html'; + $filename = $this->config['skin_path'] . '/templates/' . $name . '.html'; - return (is_file($filename) && is_readable($filename)); + return (is_file($filename) && is_readable($filename)); } /** |